audlegacy-plugins: src/cue/cuesheet.c comparison

comparison src/cue/cuesheet.c @ 901:08643d5994fe trunk

[svn] - now do_setpos() takes relative position as the argument and works even if cuesheets are included in large playlist. may close #869. - improve handling of end of cue. - suppress warnings.

author	yaz
date	Mon, 26 Mar 2007 14:44:46 -0700
parents	59a876be8550
children	a5752784d87b

comparison

equal deleted inserted replaced

-:d985f0dcdeb0
+:08643d5994fe
 	return get_tuple_uri(uri);
 }
 static TitleInput *get_tuple_uri(gchar *uri)
 {
 gchar *path2 = g_strdup(uri + 6);
 gchar *_path = strchr(path2, '?');
-	gint track = 0;
+gint track = 0;
-	gint file_length = 0;
 	InputPlugin *dec;
 	TitleInput *phys_tuple, *out;
 if (_path != NULL && *_path == '?')
 #ifdef DEBUG
 g_print("e: stop\n");
 #endif
 }
+// not publicly available functions.
+extern void playback_stop(void);
+extern void mainwin_clear_song_info(void);
 static gpointer do_stop(gpointer data)
 {
-InputPlayback *playback = (InputPlayback *)data;
+//    InputPlayback *playback = (InputPlayback *)data;
 Playlist *playlist = playlist_get_active();
 #ifdef DEBUG
 g_print("f: do_stop\n");
 #endif
 ip_data.stop = TRUE;
 #ifdef DEBUG
 g_print("e: do_stop\n");
 #endif
 g_thread_exit(NULL);
+return NULL; //dummy
 }
 static gpointer do_setpos(gpointer data)
 {
 Playlist *playlist = playlist_get_active();
-#ifdef DEBUG
+gint pos = playlist_get_position_nolock(playlist);
-g_print("do_setpos: %d\n\n", *(guint *)data);
+gint incr = *(gint *)data;
-#endif
-playlist_set_position(playlist, *(guint *)data);
+pos = pos + incr;
+if(pos < 0)
+pos = 0;
+#ifdef DEBUG
+g_print("do_setpos: pos = %d\n\n", pos);
+#endif
+playlist_set_position(playlist, (guint)pos);
 g_thread_exit(NULL);
+return NULL; //dummy
 }
 static void cue_pause(InputPlayback * data, short p)
 {
 	if (real_ip != NULL)
 */
 static gpointer watchdog_func(gpointer data)
 {
 gint time = 0;
 Playlist *playlist = NULL;
-GTimeVal sleep_time, startup_time;
+GTimeVal sleep_time;
 #ifdef DEBUG
 g_print("f: watchdog\n");
 #endif
 continue;
 // prev track
 if (time < cue_tracks[cur_cue_track].index)
 {
-guint pos;
+gint incr;
+gint oldpos = cur_cue_track;
 #ifdef DEBUG
 g_print("i: watchdog prev\n");
 g_print("time = %d cur = %d cidx = %d nidx = %d\n", time, cur_cue_track,
 cue_tracks[cur_cue_track].index,
 cue_tracks[cur_cue_track+1].index);
 #endif
 while(time < cue_tracks[cur_cue_track].index) {
 cur_cue_track--;
-pos = cur_cue_track;
+incr = cur_cue_track - oldpos; // relative position
 if (time >= cue_tracks[cur_cue_track].index)
 finetune_seek = time;
 }
-exec_thread = g_thread_create(do_setpos, &pos, FALSE, NULL);
+exec_thread = g_thread_create(do_setpos, &incr, FALSE, NULL);
 g_usleep(TRANSITION_GUARD_TIME);
 }
 // next track
 if (cur_cue_track + 1 < last_cue_track && time > cue_tracks[cur_cue_track + 1].index)
 {
-guint pos;
+gint incr;
+gint oldpos = cur_cue_track;
 #ifdef DEBUG
 g_print("i: watchdog next\n");
 g_print("time = %d cur = %d cidx = %d nidx = %d last = %d lidx = %d\n", time, cur_cue_track,
 cue_tracks[cur_cue_track].index,
 cue_tracks[cur_cue_track+1].index,
 last_cue_track, cue_tracks[last_cue_track].index);
 #endif
 while(time > cue_tracks[cur_cue_track + 1].index) {
 cur_cue_track++;
-pos = cur_cue_track;
+incr = cur_cue_track - oldpos; // relative position
 if (time <= cue_tracks[cur_cue_track].index)
 finetune_seek = time;
 }
 if(cfg.stopaftersong) {
 exec_thread = g_thread_create(do_stop, (void *)real_ip, FALSE, NULL);
 }
 else {
-exec_thread = g_thread_create(do_setpos, &pos, FALSE, NULL);
+exec_thread = g_thread_create(do_setpos, &incr, FALSE, NULL);
 g_usleep(TRANSITION_GUARD_TIME);
 }
 }
 // last track
 if (cur_cue_track + 1 == last_cue_track &&
 (cue_tracks[last_cue_track].index - time < 500 ||
 time > cue_tracks[last_cue_track].index) ){ // may not happen. for safety.
 if(!real_ip->output->buffer_playing()) {
-#ifdef DEBUG
+gint pos = playlist_get_position(playlist);
-g_print("i: watchdog eof reached\n");
+if (pos + 1 == playlist_get_length_nolock(playlist)) {
-#endif
+#ifdef DEBUG
-if(cfg.repeat) {
+g_print("i: watchdog eof reached\n\n");
-guint pos = 0;
+#endif
-exec_thread = g_thread_create(do_setpos, &pos, FALSE, NULL);
+if(cfg.repeat) {
+gint incr = -pos;
+exec_thread = g_thread_create(do_setpos, &incr, FALSE, NULL);
+g_usleep(TRANSITION_GUARD_TIME);
+}
+else {
+exec_thread = g_thread_create(do_stop, (void *)real_ip, FALSE, NULL);
+g_usleep(TRANSITION_GUARD_TIME);
+}
 }
 else {
-exec_thread = g_thread_create(do_stop, (void *)real_ip, FALSE, NULL);
+#ifdef DEBUG
+g_print("i: watchdog end of cue, advance in playlist\n\n");
+#endif
+gint incr = 1;
+exec_thread = g_thread_create(do_setpos, &incr, FALSE, NULL);
+g_usleep(TRANSITION_GUARD_TIME);
 }
 }
 }
 }
 #ifdef DEBUG

Mercurial > audlegacy-plugins

comparison src/cue/cuesheet.c @ 901:08643d5994fe trunk