stop memory leakage, support looping

diff --git a/mp3player.c b/mp3player.c
index 2b5b7d8ce9d1344af04826d11bc4083519a62ad1..2149e0885479ebd9403943bb3f4cf4c0d3f415d2 100644 (file)
--- a/mp3player.c
+++ b/mp3player.c
@@ -2,26 +2,57 @@
 #include <stdbool.h>
 #include <ao/ao.h>
 #include <mpg123.h>
+#include <unistd.h>
 #define BITS 8
 
+struct playermem {
+    ao_device* aodev;
+    mpg123_handle* mh;
+    unsigned char* buffer;
+};
+
+struct playersettings {
+    const char* file;
+    bool loop;
+};
+
+static void cleanupThread(void* arg)
+{
+    struct playermem* mem = (struct playermem*) arg;
+    free(mem->buffer);
+    ao_close(mem->aodev);
+    mpg123_close(mem->mh);
+    mpg123_delete(mem->mh);
+    mpg123_exit();
+    ao_shutdown();
+    free(mem);
+}
+
 pthread_t startPlayThread(const char* file, bool loop)
 {
     pthread_t thread;
-    pthread_create(&thread, NULL, playFunc, (void*) file, loop);
+    struct playersettings* settings = malloc(sizeof(struct playersettings));
+    settings->file=file;
+    settings->loop=loop;
+    pthread_create(&thread, NULL, playFunc, (void*) settings);
     return thread;
 }
 
-void* playFunc(void* file)
+void* playFunc(void* arg)
 {
+    pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+    //pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
     bool running = true;
-    mpg123_handle* mh;
-    unsigned char* buffer;
+    struct playermem* mem = (struct playermem*) malloc(sizeof(struct playermem));
+    struct playersettings* settings = (struct playersettings*) arg;
+    //mpg123_handle* mh;
+    //unsigned char* buffer;
     size_t buffer_size;
     size_t done;
     int err;
     
     int driver;
-    ao_device* aodev;
+    //ao_device* aodev;
     ao_sample_format format;
     int channels;
     int encoding;
@@ -30,31 +61,38 @@ void* playFunc(void* file)
     ao_initialize();
     driver = ao_default_driver_id();
     mpg123_init();
-    mh = mpg123_new(NULL, &err);
-    buffer_size = mpg123_outblock(mh);
-    buffer = (unsigned char*) malloc(buffer_size * sizeof(unsigned char));
-    
-    if (mpg123_open(mh, file) != MPG123_OK) return NULL;
-    if (mpg123_getformat(mh, &rate, &channels, &encoding) != MPG123_OK) return NULL;
+    mem->mh = mpg123_new(NULL, &err);
+    buffer_size = mpg123_outblock(mem->mh);
+    mem->buffer = (unsigned char*) malloc(buffer_size * sizeof(unsigned char));
+    pthread_cleanup_push(cleanupThread, (void*) mem);
+    do {
+        if (mpg123_open(mem->mh, settings->file) != MPG123_OK) return NULL;
+        if (mpg123_getformat(mem->mh, &rate, &channels, &encoding) != MPG123_OK) return NULL;
     
-    format.bits = mpg123_encsize(encoding) * BITS;
-    format.rate = rate;
-    format.channels = channels;
-    format.byte_format = AO_FMT_NATIVE;
-    format.matrix = 0;
-    aodev = ao_open_live(driver, &format, NULL);
-    
-    while (mpg123_read(mh, buffer, buffer_size, &done) == MPG123_OK && running) {
-        ao_play(aodev, buffer, done);
-    }
-    
-    // cleanup
-    free (buffer);
-    ao_close(aodev);
-    mpg123_close(mh);
-    mpg123_delete(mh);
-    mpg123_exit();
-    ao_shutdown();
+        format.bits = mpg123_encsize(encoding) * BITS;
+        format.rate = rate;
+        format.channels = channels;
+        format.byte_format = AO_FMT_NATIVE;
+        format.matrix = 0;
+        mem->aodev = ao_open_live(driver, &format, NULL);
+        
+        
+        
+        while (mpg123_read(mem->mh, mem->buffer, buffer_size, &done) == MPG123_OK && running)
+        {
+            ao_play(mem->aodev, mem->buffer, done);
+            pthread_testcancel();
+        }
+    } while (settings->loop);
     
+    pthread_cleanup_pop(1);
+    pthread_exit((void*) pthread_self());
 }
 
+//int main(int argc, char** argv)
+//{
+//    pthread_t th = startPlayThread("platt01.mp3", true);
+//    //sleep(3);
+//    //pthread_cancel(th);
+//    pthread_join(th, NULL);
+//}

diff --git a/mp3player.h b/mp3player.h
index 5217cdd52e8b701673839a35dd81e00f0511ff3f..3ef0042f5f3d37d72d9fb4bc70622ec493fc9271 100644 (file)
--- a/mp3player.h
+++ b/mp3player.h
@@ -3,8 +3,8 @@
 #include <pthread.h>
 #include <stdbool.h>
 
-pthread_t startPlayThread(const char*, bool);
+long unsigned int startPlayThread ( const char* file, bool loop );
 
-void* playFunc(void*, bool);
+void* playFunc(void*);
 
 #endif