Mercurial > audlegacy-plugins
changeset 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 | d985f0dcdeb0 |
| children | 877a3725b51e |
| files | ChangeLog src/cue/Makefile src/cue/cuesheet.c |
| diffstat | 3 files changed, 68 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 26 01:19:26 2007 -0700 +++ b/ChangeLog Mon Mar 26 14:44:46 2007 -0700 @@ -1,3 +1,23 @@ +2007-03-26 08:19:26 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [1900] + - add a starting point for xmms-rootvis port. giacomo will need to + finish this up, as my XLib skills are not enough at this time. + + trunk/configure.ac | 24 + + trunk/mk/rules.mk.in | 2 + trunk/src/rootvis/Makefile | 22 + + trunk/src/rootvis/config.h | 57 +++ + trunk/src/rootvis/config_backend.c | 172 +++++++++ + trunk/src/rootvis/config_definition.c | 152 ++++++++ + trunk/src/rootvis/config_frontend.c | 210 ++++++++++++ + trunk/src/rootvis/config_frontend.h | 62 +++ + trunk/src/rootvis/config_frontend_widgets.c | 486 ++++++++++++++++++++++++++++ + trunk/src/rootvis/getroot.c | 400 +++++++++++++++++++++++ + trunk/src/rootvis/rootvis.c | 456 ++++++++++++++++++++++++++ + trunk/src/rootvis/rootvis.h | 103 +++++ + 12 files changed, 2146 insertions(+) + + 2007-03-25 16:26:39 +0000 Giacomo Lozito <james@develia.org> revision [1898] - aosd: use XMapRaised in place of XMapWindow to ensure that the osd window is raised with some window managers
--- a/src/cue/Makefile Mon Mar 26 01:19:26 2007 -0700 +++ b/src/cue/Makefile Mon Mar 26 14:44:46 2007 -0700 @@ -9,7 +9,7 @@ OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. -Wall CXXFLAGS = $(CFLAGS)
--- a/src/cue/cuesheet.c Mon Mar 26 01:19:26 2007 -0700 +++ b/src/cue/cuesheet.c Mon Mar 26 14:44:46 2007 -0700 @@ -224,10 +224,9 @@ static TitleInput *get_tuple_uri(gchar *uri) { - gchar *path2 = g_strdup(uri + 6); - gchar *_path = strchr(path2, '?'); - gint track = 0; - gint file_length = 0; + gchar *path2 = g_strdup(uri + 6); + gchar *_path = strchr(path2, '?'); + gint track = 0; InputPlugin *dec; TitleInput *phys_tuple, *out; @@ -338,9 +337,13 @@ #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"); @@ -359,16 +362,25 @@ 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(); + gint pos = playlist_get_position_nolock(playlist); + gint incr = *(gint *)data; + + pos = pos + incr; + if(pos < 0) + pos = 0; + #ifdef DEBUG - g_print("do_setpos: %d\n\n", *(guint *)data); + g_print("do_setpos: pos = %d\n\n", pos); #endif - playlist_set_position(playlist, *(guint *)data); + playlist_set_position(playlist, (guint)pos); g_thread_exit(NULL); + return NULL; //dummy } static void cue_pause(InputPlayback * data, short p) @@ -505,7 +517,7 @@ { gint time = 0; Playlist *playlist = NULL; - GTimeVal sleep_time, startup_time; + GTimeVal sleep_time; #ifdef DEBUG g_print("f: watchdog\n"); @@ -558,7 +570,8 @@ // 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, @@ -567,19 +580,20 @@ #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, @@ -589,7 +603,7 @@ #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; } @@ -598,7 +612,7 @@ 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); } } @@ -608,15 +622,29 @@ (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()) { + gint pos = playlist_get_position(playlist); + if (pos + 1 == playlist_get_length_nolock(playlist)) { #ifdef DEBUG - g_print("i: watchdog eof reached\n"); + g_print("i: watchdog eof reached\n\n"); #endif - if(cfg.repeat) { - guint pos = 0; - 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); } } }