audlegacy-plugins: src/tta/aud-tta.c comparison

comparison src/tta/aud-tta.c @ 851:712df386597e trunk

[svn] - add support for mseek. - fix inaccurate seek position calculation. this bug prevented tta working with cuesheet. - move to GThread API and make use of GCond signaling.

author	yaz
date	Wed, 14 Mar 2007 03:16:45 -0700
parents	7b65072e2efb
children	421d5587b761

comparison

equal deleted inserted replaced

-:e9d2de5aa638
+:712df386597e
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <glib.h>
-#include <pthread.h>
 #include <string.h>
 #include <audacious/util.h>
 #include <audacious/plugin.h>
 #include <audacious/titlestring.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
 #include <audacious/id3tag.h>
+/* #define DEBUG 1 */
 #define  PLUGIN_VERSION "1.2"
 #define  PROJECT_URL "<http://www.true-audio.com>"
 #pragma pack (1)
 static void get_song_info (char *filename, char **title, int *length);
 static void file_info (char *filename);
 static void about ();
 static TitleInput *get_song_tuple(char *filename);
 static gchar *extname(const char *filename);
+static void mseek (InputPlayback *data, gulong millisecond);
 gchar *tta_fmts[] = { "tta", NULL };
 InputPlugin tta_ip =
 {
 get_song_tuple, // get_song_tuple
 NULL, // set_song_tuple
 NULL, // buffer
 NULL, // vfs
 tta_fmts,
+mseek,
 };
 InputPlugin *
 get_iplugin_info (void)
 {
 tta_ip.description = g_strdup_printf ("True Audio Plugin %s", PLUGIN_VERSION);
 return &tta_ip;
 }
-static pthread_t decode_thread;
+static GThread *decode_thread;
 static char sample_buffer[PCM_BUFFER_LENGTH * MAX_BSIZE * MAX_NCH];
 static tta_info info;		// currently playing file info
 static long seek_position = -1;
 static int  playing = FALSE;
 static int  read_samples = -1;
+static GMutex *play_mutex;
+static GCond *play_cond;
 static void
 tta_error (int error)
 {
 char *message;
 g_free (name);
 return p;
 }
 static void *
-play_loop (void *arg)
+play_loop (gpointer arg)
 {
-InputPlayback *playback = arg;
+InputPlayback *playback = (InputPlayback *)arg;
 int  bufsize = PCM_BUFFER_LENGTH  * info.BSIZE * info.NCH;
+GTimeVal sleep_time;
 ////////////////////////////////////////
 // decode PCM_BUFFER_LENGTH samples
 // into the current PCM buffer position
-while (playing)
+while (playing) {
-{
+while ((read_samples = get_samples (sample_buffer)) > 0) {
-	while ((read_samples = get_samples (sample_buffer)) > 0)
+// wait for buffer becomes available
-	{
+while ((playback->output->buffer_free () < bufsize) && seek_position == -1) {
+g_get_current_time(&sleep_time);
-	    while ((playback->output->buffer_free () < bufsize)
+g_time_val_add(&sleep_time, 10000);
-		   && seek_position == -1)
+g_mutex_lock(play_mutex);
-	    {
+g_cond_timed_wait(play_cond, play_mutex, &sleep_time);
-		if (!playing)
+g_mutex_unlock(play_mutex);
-		    goto DONE;
+if (!playing)
-		xmms_usleep (10000);
+goto DONE;
-	    }
+}
-	    if (seek_position == -1)
-	    {
+if (seek_position == -1) {
-		produce_audio(playback->output->written_time(),
+produce_audio(playback->output->written_time(),
-			      ((info.BPS == 8) ? FMT_U8 : FMT_S16_LE),
+((info.BPS == 8) ? FMT_U8 : FMT_S16_LE),
-			      info.NCH,
+info.NCH,
-			      read_samples * info.NCH * info.BSIZE,
+read_samples * info.NCH * info.BSIZE,
-			      sample_buffer,
+sample_buffer,
-			      NULL);
+NULL);
-	    }
+}
-	    else
+else {
-	    {
+set_position (seek_position / SEEK_STEP); //now seek_postion is in millisecond.
-		set_position (seek_position);
+playback->output->flush (seek_position);
-		playback->output->flush (seek_position * SEEK_STEP);
+seek_position = -1;
-		seek_position = -1;
+}
-	    }
-	}
+// sleep for a while
-	playback->output->buffer_free ();
+g_get_current_time(&sleep_time);
-	playback->output->buffer_free ();
+g_time_val_add(&sleep_time, 10000);
-	xmms_usleep(10000);
+g_mutex_lock(play_mutex);
-}
+g_cond_timed_wait(play_cond, play_mutex, &sleep_time);
-DONE:
+g_mutex_unlock(play_mutex);
+if (!playing)
-////////////////////////
+goto DONE;
-// destroy memory pools
+}
-player_stop ();
+// process remaining data
-///////////////////////////////
+playback->output->buffer_free ();
-// close currently playing file
+playback->output->buffer_free ();
-close_tta_file (&info);
+while(playback->output->buffer_playing()) {
-pthread_exit (NULL);
+g_get_current_time(&sleep_time);
+g_time_val_add(&sleep_time, 10000);
+g_mutex_lock(play_mutex);
+g_cond_timed_wait(play_cond, play_mutex, &sleep_time);
+g_mutex_unlock(play_mutex);
+if(!playing)
+goto DONE;
+}
+}
+DONE:
+g_thread_exit(NULL);
 }
 static void
 init ()
 {
 memset (&info, 0, sizeof (tta_info));
+play_mutex = g_mutex_new();
+play_cond = g_cond_new();
 }
 static void
 cleanup ()
 {
+g_cond_free(play_cond);
+g_mutex_free(play_mutex);
 }
 static void
 about ()
 {
 {
 char *filename = playback->filename;
 char *title;
 long datasize, origsize, bitrate;
+g_mutex_lock(play_mutex);
 playing = FALSE;
+g_mutex_unlock(play_mutex);
+g_cond_signal(play_cond);
 ////////////////////////////////////////
 // open TTA file
 if (open_tta_file (filename, &info, 0) < 0)
 {
-	tta_error (info.STATE);
+tta_error (info.STATE);
-	close_tta_file (&info);
+close_tta_file (&info);
-	return;
+return;
 }
 ////////////////////////////////////////
 // initialize TTA player
 if (player_init (&info) < 0)
 {
-	tta_error (info.STATE);
+tta_error (info.STATE);
-	close_tta_file (&info);
+close_tta_file (&info);
-	return;
+return;
 }
 if (playback->output->open_audio ((info.BPS == 8) ? FMT_U8 : FMT_S16_LE,
-				   info.SAMPLERATE, info.NCH) == 0)
+info.SAMPLERATE, info.NCH) == 0)
 {
-	tta_error (OUTPUT_ERROR);
+tta_error (OUTPUT_ERROR);
-	close_tta_file (&info);
+close_tta_file (&info);
-	return;
+return;
 }
 title = get_title (filename, &info);
+#ifdef DEBUG
 printf("title @1 = %s\n", title);
+#endif
 {
 	    TitleInput *tuple;
 	    tuple = get_song_tuple(filename);
 	    if(tuple->track_name) {
 		    g_free(title);
 		    title = g_strdup(tuple->track_name);
+#ifdef DEBUG
 		    printf("title @2 = %s\n", title);
+#endif
 	    }
 	    bmp_title_input_free(tuple);
 }
 datasize = file_size(filename) - info.DATAPOS;
 origsize = info.DATALENGTH * info.BSIZE * info.NCH;
 bitrate  = (long) ((float) datasize / origsize *
-	        (info.SAMPLERATE * info.NCH * info.BPS));
+(info.SAMPLERATE * info.NCH * info.BPS));
 tta_ip.set_info (title, 1000 * info.LENGTH, bitrate, info.SAMPLERATE, info.NCH);
 if (title)
-	g_free (title);
+g_free (title);
+g_mutex_lock(play_mutex);
 playing = TRUE;
 seek_position = -1;
 read_samples = -1;
+g_mutex_unlock(play_mutex);
-pthread_create (&decode_thread, NULL, play_loop, playback);
+g_cond_signal(play_cond);
+decode_thread = g_thread_create(play_loop, (gpointer)playback, TRUE, NULL);
+printf("decode_thread = %p\n", decode_thread);
 }
 static void
 tta_pause (InputPlayback *playback, short paused)
 {
 playback->output->pause (paused);
 }
 static void
 stop (InputPlayback *playback)
 {
-if (playing)
+printf("tta: f: stop:\n");
-{
-	playing = FALSE;
+g_mutex_lock(play_mutex);
-	pthread_join (decode_thread, NULL);
+playing = FALSE;
-	playback->output->close_audio ();
+g_mutex_unlock(play_mutex);
-	close_tta_file (&info);
+g_cond_signal(play_cond);
-	read_samples = 0;
+printf("tta: i: stop: stop signaled\n");
+if (decode_thread) {
+g_thread_join(decode_thread);
+}
+#ifdef DEBUG
+printf("tta: stop: decode_thread joined\n");
+#endif
+playback->output->close_audio ();
+player_stop();
+close_tta_file (&info);
+read_samples = 0;
+}
+static void
+mseek (InputPlayback *data, gulong millisecond)
+{
+if (playing) {
+seek_position = millisecond;
 }
 }
 static void
 seek (InputPlayback *data, int time)
 {
-if (playing)
+mseek(data, 1000 * time);
-{
-	seek_position = 1000 * time / SEEK_STEP;
-	while (seek_position != -1)
-	    xmms_usleep (10000);
-}
 }
 static int
 get_time (InputPlayback *playback)
 {

Mercurial > audlegacy-plugins

comparison src/tta/aud-tta.c @ 851:712df386597e trunk