ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Neet fixes

Browse source
This commit is contained in:
IlyaShurupov 2023-11-30 15:19:40 +03:00 • committed by Ilya Shurupov
parent b74c5bc5e5
commit 98b5e4d182
10 changed files with 186 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
LibraryViewer/private/LibraryViewer.cpp
View file

@ -11,6 +11,23 @@ namespace tp {
using namespace tp;
#define AS_STR (int1*) trackProperty.second.to_str().c_str()
#define AS_INT std::stoll((int1*) trackProperty.second.to_str().c_str())
#define AS_BOOL trackProperty.second.evaluate_as_boolean()
#define PROP(name) trackProperty.first == #name
tp::String getHome() {
const char* envVarName = "LIB_VIEW_HOME";
char* envVarValue = std::getenv(envVarName);
if (envVarValue != nullptr) {
tp::String out;
out = (int1*) (std::string(envVarValue) + "/").c_str();
return out;
} else {
return "";
}
}
bool Library::loadJson(const String& path) {
LocalConnection libraryFile;
Buffer<int1> libraryFileMem;
@ -34,12 +51,29 @@ bool Library::loadJson(const String& path) {
auto & track = trackNode.get<picojson::object>();
for (auto & trackProperty : track) {
if (trackProperty.first == "Name") {
newTrack.mName = (int1*) trackProperty.second.to_str().c_str();
}
else if (trackProperty.first == "Artist") {
newTrack.mArtist = (int1*) trackProperty.second.to_str().c_str();
}
if (PROP(Name)) newTrack.mName = AS_STR;
else if (PROP(Artist)) newTrack.mArtist = AS_STR;
else if (PROP(Track ID)) newTrack.mId = AS_INT;
else if (PROP(Album Artist)) newTrack.mAlbumArtist = AS_STR;
else if (PROP(Composer)) newTrack.mComposer = AS_STR;
else if (PROP(Album)) newTrack.mAlbum = AS_STR;
else if (PROP(Genre)) newTrack.mGenre = AS_STR;
else if (PROP(Size)) newTrack.mSize = AS_INT;
else if (PROP(Total Time)) newTrack.mTotalTime = AS_INT;
else if (PROP(Year)) newTrack.mYear = AS_INT;
else if (PROP(Date Modified)) newTrack.mDateModified = AS_STR;
else if (PROP(Date Added)) newTrack.mDateAdded = AS_STR;
else if (PROP(Play Count)) newTrack.mPlayCount = AS_INT;
else if (PROP(Play Date)) newTrack.mPlayDate = AS_STR;
else if (PROP(Play Date UTC)) newTrack.mPlayDateUTC = AS_STR;
else if (PROP(Skip Count)) newTrack.mSkipCount = AS_INT;
else if (PROP(Skip Date)) newTrack.mSkipDate = AS_STR;
else if (PROP(Release Date)) newTrack.mReleaseDate = AS_STR;
else if (PROP(Album Rating)) newTrack.mAlbumRating = AS_INT;
else if (PROP(Album Rating Computed)) newTrack.mAlbumRatingComputed = AS_BOOL;
else if (PROP(Loved)) newTrack.mLoved = AS_BOOL;
else if (PROP(Album Loved)) newTrack.mAlbumLoved = AS_BOOL;
else if (PROP(Explicit)) newTrack.mExplicit = AS_BOOL;
}
mTraks.append(newTrack);

49
LibraryViewer/private/WavPlayer.cpp
View file

@ -5,6 +5,7 @@
#include "portaudio.h"
#include "Buffer.hpp"
#include "Multithreading.hpp"
typedef u_int8_t uint8_t;
typedef u_int16_t uint16_t;
@ -13,6 +14,7 @@ typedef u_int32_t uint32_t;
#include "wav_file_reader.h"
class Sine {
friend class MusicPlayerContext;
public:
Sine() {}
@ -82,6 +84,7 @@ private:
int paCallbackMethod(const void* inputBuffer, void* outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo, PaStreamCallbackFlags statusFlags) {
float* out = (float*) outputBuffer;
mMutex.lock();
for (unsigned long i = 0; i < framesPerBuffer; i++) {
*out++ = leftBuffer[leftSampleIdx];
*out++ = rightBuffer[rightSampleIdx];
@ -94,6 +97,7 @@ private:
if (rightSampleIdx >= rightBuffer.size())
rightSampleIdx -= 1;
}
mMutex.unlock();
return paContinue;
}
@ -115,6 +119,8 @@ private:
int rightSampleIdx = 0;
int sampleRate = 44100;
tp::Mutex mMutex;
};
class MusicPlayerContext {
@ -128,14 +134,18 @@ public:
}
}
void load() {
bool load(SongId id) {
if (connected) {
stop();
sine.close();
}
exampleLoad();
connected = sine.open(Pa_GetDefaultOutputDevice());
if (loadWav(id)) {
connected = sine.open(Pa_GetDefaultOutputDevice());
return true;
}
return false;
}
void stop() {
@ -159,9 +169,12 @@ public:
}
}
void exampleLoad() {
bool loadWav(SongId id) {
AudioFile<double> audioFile;
audioFile.load("library/Example.wav");
if (!audioFile.load(std::string(getHome().read()) + std::string("traks/") + std::to_string(id) + ".wav")) {
return false;
}
audioFile.printSummary();
@ -180,6 +193,20 @@ public:
left->getBuff()[i] = audioFile.samples[0][i];
right->getBuff()[i] = audioFile.samples[1][i];
}
return true;
}
float getProgress() const {
return float(sine.leftSampleIdx) / sine.leftBuffer.size();
}
void setProgress(float newProgress) {
newProgress = tp::clamp(newProgress, 0.f, 1.f);
sine.mMutex.lock();
sine.leftSampleIdx = sine.leftBuffer.size() * newProgress;
sine.rightSampleIdx = sine.leftBuffer.size() * newProgress;
sine.mMutex.unlock();
}
private:
@ -196,8 +223,8 @@ TrackPlayer::~TrackPlayer() {
delete mContext;
}
void TrackPlayer::startStreamTrack(SongId id) {
mContext->load();
bool TrackPlayer::startStreamTrack(SongId id) {
return mContext->load(id);
}
void TrackPlayer::playSong() {
@ -210,8 +237,12 @@ void TrackPlayer::stopSong() {
void TrackPlayer::setVolume(float volume) {}
float TrackPlayer::getProgress() const { return 0; }
float TrackPlayer::getProgress() const {
return mContext->getProgress();
}
float TrackPlayer::getDurationSec() const { return 0; }
void TrackPlayer::setProgress(float newProgress) {}
void TrackPlayer::setProgress(float newProgress) {
mContext->setProgress(newProgress);
}