m4a files quit properly

ravachol · Nov 28, 2023 · 9765caa · 9765caa
1 parent b941f0c
commit 9765caa
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 34 deletions.
diff --git a/src/player.c b/src/player.c
@@ -23,9 +23,9 @@ typedef struct
 } PixelData;
 #endif
 
-const char VERSION[] = "1.7.4";
+const char VERSION[] = "1.8";
 const int LOGO_COLOR = 3;
-const int VERSION_COLOR = 6;
+const int VERSION_COLOR = 2;
 const int ABSOLUTE_MIN_WIDTH = 38;
 volatile bool refresh = true;
 bool visualizerEnabled = true;

diff --git a/src/playerops.c b/src/playerops.c
@@ -35,8 +35,6 @@ volatile bool clearingErrors = false;
 volatile bool songLoading = false;
 GDBusConnection *connection = NULL;
 
-UserData userData;
-
 void updateLastSongSwitchTime()
 {
         clock_gettime(CLOCK_MONOTONIC, &start_time);
@@ -328,28 +326,13 @@ Node *getSongByNumber(int songNumber)
 
 void assignLoadedData()
 {
-        if (usingSongDataA)
-        {
-                if (loadingdata.songdataB != NULL)
-                {
-                        userData.filenameB = loadingdata.songdataB->pcmFilePath;
-                        userData.songdataB = loadingdata.songdataB;
-                        if (hasBuiltinDecoder(loadingdata.songdataB->filePath))
-                                prepareNextDecoder(loadingdata.songdataB->filePath);
-                        else if (endsWith(loadingdata.songdataB->filePath, "opus"))
-                                prepareNextOpusDecoder(loadingdata.songdataB->filePath);
-                        else if (endsWith(loadingdata.songdataB->filePath, "ogg"))
-                                prepareNextVorbisDecoder(loadingdata.songdataB->filePath);
-                }
-                else
-                        userData.filenameB = NULL;
-        }
-        else
+        if (loadingdata.loadA)
         {
                 if (loadingdata.songdataA != NULL)
                 {
                         userData.filenameA = loadingdata.songdataA->pcmFilePath;
                         userData.songdataA = loadingdata.songdataA;
+
                         if (hasBuiltinDecoder(loadingdata.songdataA->filePath))
                                 prepareNextDecoder(loadingdata.songdataA->filePath);
                         else if (endsWith(loadingdata.songdataA->filePath, "opus"))
@@ -360,6 +343,24 @@ void assignLoadedData()
                 else
                         userData.filenameA = NULL;
         }
+        else
+        {
+                if (loadingdata.songdataB != NULL)
+                {
+                        userData.filenameB = loadingdata.songdataB->pcmFilePath;
+                        userData.songdataB = loadingdata.songdataB;
+
+                        if (hasBuiltinDecoder(loadingdata.songdataB->filePath))
+                                prepareNextDecoder(loadingdata.songdataB->filePath);
+                        else if (endsWith(loadingdata.songdataB->filePath, "opus"))
+                                prepareNextOpusDecoder(loadingdata.songdataB->filePath);
+                        else if (endsWith(loadingdata.songdataB->filePath, "ogg"))
+                                prepareNextVorbisDecoder(loadingdata.songdataB->filePath);
+                }
+                else
+                        userData.filenameB = NULL;                        
+        }
+
 }
 
 void *songDataReaderThread(void *arg)

diff --git a/src/soundgapless.c b/src/soundgapless.c
@@ -13,7 +13,9 @@ soundgapless.c
 */
 
 ma_context context;
-UserData *g_userData;
+
+UserData userData;
+
 PCMFileDataSource pcmDataSource;
 
 ma_result initFirstDatasource(PCMFileDataSource *pPCMDataSource, UserData *pUserData)
@@ -58,11 +60,16 @@ ma_result initFirstDatasource(PCMFileDataSource *pPCMDataSource, UserData *pUser
         }
         else
         {
-                if (pPCMDataSource->fileA == NULL)
+                if ((pPCMDataSource->currentFileIndex == 0) && pPCMDataSource->fileA == NULL)
                 {
                         pPCMDataSource->filenameA = pUserData->filenameA;
                         pPCMDataSource->fileA = fopen(pUserData->filenameA, "rb");
                 }
+                else if ((pPCMDataSource->currentFileIndex == 1) && pPCMDataSource->fileB == NULL)
+                {
+                        pPCMDataSource->filenameB = pUserData->filenameB;
+                        pPCMDataSource->fileB = fopen(pUserData->filenameB, "rb");
+                }
 
                 pPCMDataSource->format = SAMPLE_FORMAT;
                 pPCMDataSource->channels = CHANNELS;
@@ -171,14 +178,27 @@ void switchAudioImplementation()
 {
         enum AudioImplementation currentImplementation = getCurrentImplementationType();
 
-        if (g_userData->currentSongData == NULL)
+        if (pcmDataSource.currentFileIndex == 0)
+        {
+                userData.currentSongData = userData.songdataA;
+        }
+        else
+        {
+                userData.currentSongData = userData.songdataB;
+        }
+
+        if (userData.currentSongData == NULL)
+        {
+                setEOFNotReached();
                 return;
+        }
 
-        char *filePath = strdup(g_userData->currentSongData->filePath);
+        char *filePath = strdup(userData.currentSongData->filePath);
 
         if (filePath == NULL || filePath[0] == '\0' || filePath[0] == '\r')
         {
                 free(filePath);
+                setEOFNotReached();
                 return;
         }
 
@@ -210,7 +230,7 @@ void switchAudioImplementation()
 
                         cleanupPlaybackDevice();
 
-                        builtin_createAudioDevice(g_userData, getDevice(), &context, &builtin_file_data_source_vtable);
+                        builtin_createAudioDevice(&userData, getDevice(), &context, &builtin_file_data_source_vtable);
 
                         pthread_mutex_unlock(&dataSourceMutex);
 
@@ -258,7 +278,7 @@ void switchAudioImplementation()
 
                         cleanupPlaybackDevice();
 
-                        opus_createAudioDevice(g_userData, getDevice(), &context, &pcm_file_data_source_vtable);
+                        opus_createAudioDevice(&userData, getDevice(), &context, &pcm_file_data_source_vtable);
 
                         pthread_mutex_unlock(&dataSourceMutex);
 
@@ -306,7 +326,7 @@ void switchAudioImplementation()
 
                         cleanupPlaybackDevice(); 
 
-                        vorbis_createAudioDevice(g_userData, getDevice(), &context, &pcm_file_data_source_vtable);
+                        vorbis_createAudioDevice(&userData, getDevice(), &context, &pcm_file_data_source_vtable);
 
                         pthread_mutex_unlock(&dataSourceMutex);
 
@@ -327,7 +347,7 @@ void switchAudioImplementation()
                         resetOpusDecoders();
                         resetAudioBuffer();
                         cleanupPlaybackDevice();                       
-                        pcm_createAudioDevice(g_userData, getDevice(), &context, &pcm_file_data_source_vtable);
+                        pcm_createAudioDevice(&userData, getDevice(), &context, &pcm_file_data_source_vtable);
 
                         pthread_mutex_unlock(&dataSourceMutex);
 
@@ -345,7 +365,6 @@ void cleanupAudioContext()
 
 void createAudioDevice(UserData *userData)
 {
-        g_userData = userData;
         ma_context_init(NULL, 0, NULL, &context);
         switchAudioImplementation();
 }
diff --git a/src/soundgapless.h b/src/soundgapless.h
@@ -33,6 +33,8 @@ typedef struct
 } UserData;
 #endif
 
+extern UserData userData;
+
 void setDecoders(bool usingA, char *filePath);
 
 void createAudioDevice(UserData *userData);

diff --git a/src/soundpcm.c b/src/soundpcm.c
@@ -68,10 +68,7 @@ void pcm_read_pcm_frames(ma_data_source *pDataSource, void *pFramesOut, ma_uint6
 
                 if (currentFile != NULL)
                         bytesRead = (ma_uint32)fread((char *)pFramesOut + (framesRead * bytesPerFrame), 1, bytesToRead, currentFile);
-                else if (pPCMDataSource->pUserData->currentSongData == NULL ||
-                         hasBuiltinDecoder(pPCMDataSource->pUserData->currentSongData->filePath) ||
-                         (endsWith(pPCMDataSource->pUserData->currentSongData->filePath, "opus")) ||
-                         (endsWith(pPCMDataSource->pUserData->currentSongData->filePath, "ogg")))
+                else 
                         return;
 
                 // If file is empty, skip