uses miniaudio decoder for wav, flac and mp3.

ravachol · Nov 19, 2023 · 7c9d496 · 7c9d496
1 parent 1cde7b9
commit 7c9d496
Show file tree

Hide file tree

Showing 20 changed files with 3,217 additions and 1,429 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ LIBS = -lpthread -lrt -pthread -lm -lfreeimage -lglib-2.0 $(shell $(PKG_CONFIG)
 
 OBJDIR = src/obj
 PREFIX = /usr
-SRCS = src/mpris.c src/playerops.c src/volume.c src/cutils.c src/soundgapless.c src/songloader.c src/file.c src/chafafunc.c src/cache.c src/metadata.c src/playlist.c src/stringfunc.c src/term.c  src/settings.c src/player.c src/albumart.c src/visuals.c src/kew.c
+SRCS = src/soundcommon.c src/soundbuiltin.c src/soundpcm.c src/mpris.c src/playerops.c src/volume.c src/cutils.c src/soundgapless.c src/songloader.c src/file.c src/chafafunc.c src/cache.c src/metadata.c src/playlist.c src/stringfunc.c src/term.c  src/settings.c src/player.c src/albumart.c src/visuals.c src/kew.c
 OBJS = $(SRCS:src/%.c=$(OBJDIR)/%.o)
 
 MAN_PAGE = kew.1 

diff --git a/README.md b/README.md
@@ -4,8 +4,6 @@
 [![Debian package](https://img.shields.io/debian/v/kew/sid?color=red&label=debian&logo=debian&style=for-the-badge)](https://packages.debian.org/sid/kew)
 [![GitHub license](https://img.shields.io/github/license/ravachol/kew?color=333333&style=for-the-badge)](https://github.com/ravachol/kew/blob/master/LICENSE)
 
-
-
 Listen to music in the terminal.
 
 <div align="center">
@@ -14,15 +12,14 @@ Listen to music in the terminal.
 
 kew (/kjuː/) is a command-line music player for Linux.
 
-
-
 ## Features
 
  * Search a music library with partial titles.
  * Creates a playlist based on a matched directory. 
  * Display album covers as ASCII art or as a normal image.
  * Control the player with previous, next and pause.
- * Has gapless playback and supports 24-bit audio.
+ * Has gapless playback (between files of the same format and type) and supports 24-bit audio.
+ * Does not yet work well with very long audio files that are not mp3, wav or flac.
 
 ## Name Change
 

diff --git a/include/miniaudio/miniaudio.h b/include/miniaudio/miniaudio.h
diff --git a/src/file.c b/src/file.c
@@ -343,7 +343,7 @@ int removeDirectory(const char *path)
 
 int deleteFile(const char *filePath)
 {
-        if (unlink(filePath) == 0)
+        if (remove(filePath) == 0)
         {
                 return 0;
         }

diff --git a/src/kew.c b/src/kew.c
@@ -62,6 +62,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 #include "volume.h"
 #include "playerops.h"
 #include "mpris.h"
+#include "soundcommon.h"
 
 // #define DEBUG 1
 #define MAX_SEQ_LEN 1024    // Maximum length of sequence buffer
@@ -299,7 +300,7 @@ void prepareNextSong()
         if (loadingFailed)
                 return;
 
-        if (!skipPrev && !gotoSong && !repeatEnabled)
+        if (!skipPrev && !gotoSong && !isRepeatEnabled())
         {
                 if (nextSong != NULL)
                         currentSong = nextSong;
@@ -333,7 +334,7 @@ void prepareNextSong()
 
         refresh = true;
 
-        if (!repeatEnabled)
+        if (!isRepeatEnabled())
         {
                 pthread_mutex_lock(&(loadingdata.mutex));
                 if (usingSongDataA &&
@@ -616,12 +617,14 @@ gboolean mainloop_callback(gpointer data)
                 loadAudioData();
 
         if (songHasErrors)
-                tryLoadNext();
+                tryLoadNext();        
 
         if (isPlaybackDone())
-        {
+        {                                
                 updateLastSongSwitchTime();
-                prepareNextSong();
+                prepareNextSong();             
+                if (!doQuit)
+                        switchAudioImplementation();
         }
 
         if (doQuit || loadingFailed)
@@ -673,6 +676,7 @@ void play(Node *song)
 void cleanupOnExit()
 {
         cleanupPlaybackDevice();
+        cleanupAudioContext();        
         emitPlaybackStoppedMpris();
         unloadSongData(&loadingdata.songdataA);
         unloadSongData(&loadingdata.songdataB);
@@ -692,7 +696,7 @@ void cleanupOnExit()
         showCursor();
 
 #ifdef DEBUG
-        fclose(logFile);    
+        fclose(logFile);
 #endif
         freopen("/dev/stderr", "w", stderr);
 }

diff --git a/src/mpris.c b/src/mpris.c
@@ -368,7 +368,7 @@ static gboolean get_shuffle(GDBusConnection *connection, const gchar *sender,
                             const gchar *property_name, GVariant **value,
                             GError **error, gpointer user_data)
 {
-        *value = g_variant_new_boolean(shuffleEnabled ? TRUE : FALSE);
+        *value = g_variant_new_boolean(isShuffleEnabled() ? TRUE : FALSE);
         return TRUE;
 }
 

diff --git a/src/player.c b/src/player.c
@@ -24,7 +24,7 @@ typedef struct
 } PixelData;
 #endif
 
-const char VERSION[] = "1.5.2";
+const char VERSION[] = "1.6.0";
 const int LOGO_COLOR = 3;
 const int VERSION_COLOR = 6;
 const int ABSOLUTE_MIN_WIDTH = 38;
@@ -299,10 +299,6 @@ void printBasicMetadata(TagSettings const *metadata)
                         printf("\e[1m\e[39m");
 
                 printWithDelay(metadata->title, 9, maxWidth - 2);
-
-                // Alternative (no delay):
-                // printf("\033[1K\r %.*s", maxWidth, metadata->title);
-                // printf("\n");
         }
         cursorJumpDown(rows - 1);
 }
@@ -433,13 +429,13 @@ void printLastRow()
 
         char text[100] = " [F2 Playlist] [F3 Keys] [Q Quit]";
 
-        if (repeatEnabled)
+        if (isRepeatEnabled())
         {
                 char repeatText[] = " R";
                 strcat(text, repeatText);
         }
 
-        if (shuffleEnabled)
+        if (isShuffleEnabled())
         {
                 char shuffleText[] = " S";
                 strcat(text, shuffleText);

diff --git a/src/playerops.c b/src/playerops.c
@@ -55,7 +55,6 @@ void updateLastInputTime()
 
 void emitStringPropertyChanged(const gchar *propertyName, const gchar *newValue)
 {
-
         GVariantBuilder changed_properties_builder;
         g_variant_builder_init(&changed_properties_builder, G_VARIANT_TYPE("a{sv}"));
         g_variant_builder_add(&changed_properties_builder, "{sv}", propertyName, g_variant_new_string(newValue));
@@ -154,7 +153,10 @@ void togglePause(double *totalPauseSeconds, double *pauseSeconds, struct timespe
 
 void toggleRepeat()
 {
-        repeatEnabled = !repeatEnabled;
+
+        bool repeatEnabled = !isRepeatEnabled();
+        setRepeatEnabled(repeatEnabled);
+
         if (repeatEnabled)
         {
                 emitStringPropertyChanged("LoopStatus", "Track");
@@ -180,7 +182,8 @@ void addToPlaylist()
 
 void toggleShuffle()
 {
-        shuffleEnabled = !shuffleEnabled;
+        bool shuffleEnabled = !isShuffleEnabled();
+        setShuffleEnabled(shuffleEnabled);
 
         if (shuffleEnabled)
         {
@@ -254,7 +257,7 @@ void calcElapsedTime()
         {
                 elapsedSeconds = (double)(current_time.tv_sec - start_time.tv_sec) +
                                  (double)(current_time.tv_nsec - start_time.tv_nsec) / 1e9;
-                elapsedSeconds += seekElapsed + seekAccumulatedSeconds;
+                elapsedSeconds += getSeekElapsed() + seekAccumulatedSeconds;
                 elapsedSeconds -= totalPauseSeconds;
                 if (elapsedSeconds > duration)
                         elapsedSeconds = duration;
@@ -272,17 +275,17 @@ void flushSeek()
 {
         if (seekAccumulatedSeconds != 0.0)
         {
-                seekElapsed += seekAccumulatedSeconds;
+                setSeekElapsed(getSeekElapsed() + seekAccumulatedSeconds);
                 seekAccumulatedSeconds = 0.0;
                 calcElapsedTime();
-                float percentage = elapsedSeconds / (float)duration * 100.0;  
+                float percentage = elapsedSeconds / (float)duration * 100.0;
 
                 if (percentage < 0.0)
                 {
-                        seekElapsed = 0.0;
+                        setSeekElapsed(0.0);
                         percentage = 0.0;
                 }
-                             
+
                 seekPercentage(percentage);
         }
 }
@@ -333,6 +336,8 @@ void assignLoadedData()
                 {
                         userData.filenameB = loadingdata.songdataB->pcmFilePath;
                         userData.songdataB = loadingdata.songdataB;
+                        if (hasBuiltinDecoder(loadingdata.songdataB->filePath))                        
+                                prepareNextDecoder(loadingdata.songdataB->filePath);
                 }
                 else
                         userData.filenameB = NULL;
@@ -343,6 +348,8 @@ void assignLoadedData()
                 {
                         userData.filenameA = loadingdata.songdataA->pcmFilePath;
                         userData.songdataA = loadingdata.songdataA;
+                        if (hasBuiltinDecoder(loadingdata.songdataA->filePath))
+                                prepareNextDecoder(loadingdata.songdataA->filePath);
                 }
                 else
                         userData.filenameA = NULL;
@@ -516,7 +523,6 @@ void skipToNumberedSong(int songNumber)
                 forceSkip = true;
                 if (songNumber < playlist.count)
                         skipToNumberedSong(songNumber + 1);
-
         }
 
         updateLastSongSwitchTime();

diff --git a/src/settings.c b/src/settings.c
@@ -29,7 +29,7 @@ AppSettings constructAppSettings(KeyValuePair *pairs, int count)
         strncpy(settings.coverEnabled, "1", sizeof(settings.coverEnabled));
         strncpy(settings.coverAnsi, "0", sizeof(settings.coverAnsi));
         strncpy(settings.visualizerEnabled, "1", sizeof(settings.visualizerEnabled));
-        strncpy(settings.useProfileColors, "0", sizeof(settings.useProfileColors));
+        strncpy(settings.useProfileColors, "1", sizeof(settings.useProfileColors));
 
         strncpy(settings.volumeUp, "+", sizeof(settings.volumeUp));
         strncpy(settings.volumeDown, "-", sizeof(settings.volumeDown));

diff --git a/src/songloader.c b/src/songloader.c
@@ -43,7 +43,7 @@ void *child_cleanup(void *arg)
         int status;
         waitpid(data->pid, &status, 0);
         ffmpegPids[data->index] = -1;
-        numRunningProcesses--;        
+        numRunningProcesses--;
         free(arg);
         return NULL;
 }
@@ -72,7 +72,7 @@ void stopFFmpeg()
         }
 }
 
-int convertToPcmFile(const char *filePath, const char *outputFilePath)
+int convertToPcmFile(SongData* songData, const char *filePath, const char *outputFilePath)
 {
         char command[COMMAND_SIZE];
 
@@ -253,7 +253,7 @@ int loadPcmAudio(SongData *songdata)
                 return -1;
 
         generateTempFilePath(songdata->filePath, songdata->pcmFilePath, "temp", ".pcm");
-        convertToPcmFile(songdata->filePath, songdata->pcmFilePath);
+        convertToPcmFile(songdata, songdata->filePath, songdata->pcmFilePath);
         int count = 0;
         int result = -1;
         while (result < 1 && count < maxSleepTimes)
@@ -306,7 +306,8 @@ SongData *loadSongData(char *filePath)
         c_sleep(10);
         loadDuration(songdata);
         c_sleep(10);
-        loadPcmAudio(songdata);
+        if (!hasBuiltinDecoder(songdata->filePath))
+                loadPcmAudio(songdata);
         songdata->deleted = false;
         return songdata;
 }
@@ -341,8 +342,11 @@ void unloadSongData(SongData **songdata)
         data->trackId = NULL;
 
         if (existsFile(data->pcmFilePath) > -1)
+        {
+                while (numRunningProcesses > 0)
+                        c_sleep(100);
                 deleteFile(data->pcmFilePath);
-
+        }
         if (data->pcmFile != NULL)
                 free(data->pcmFile);
 

diff --git a/src/songloader.h b/src/songloader.h
@@ -10,6 +10,7 @@
 #include "chafafunc.h"
 #include "albumart.h"
 #include "soundgapless.h"
+#include "soundcommon.h"
 
 #ifndef KEYVALUEPAIR_STRUCT
 #define KEYVALUEPAIR_STRUCT