diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2009-09-14 21:45:43 +0200 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2009-09-14 21:45:43 +0200 |
commit | 54deede40a49d2947029608a6dd942302569ee1c (patch) | |
tree | 168e4acb36b92b044281c1c3e7cbb281ca349052 /main.c | |
parent | ebae6eba48b75ed9fdcbf8ed2b13dfa7e022ab93 (diff) |
gapless playback WIP
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -95,21 +95,21 @@ update_songinfo (void) { else if (p_isstopped ()) { strcpy (sbtext_new, "Stopped"); } - else if (playlist_current.decoder) { + else if (str_playing_song.decoder) { codec_lock (); - DB_decoder_t *c = playlist_current.decoder; + DB_decoder_t *c = str_playing_song.decoder; float playpos = streamer_get_playpos (); int minpos = playpos / 60; int secpos = playpos - minpos * 60; - int mindur = playlist_current.duration / 60; - int secdur = playlist_current.duration - mindur * 60; + int mindur = str_playing_song.duration / 60; + int secdur = str_playing_song.duration - mindur * 60; const char *mode = c->info.channels == 1 ? "Mono" : "Stereo"; int samplerate = c->info.samplerate; int bitspersample = c->info.bps; songpos = playpos; codec_unlock (); - snprintf (sbtext_new, 512, "[%s] %dHz | %d bit | %s | %d:%02d / %d:%02d | %d songs total", playlist_current.filetype ? playlist_current.filetype:"-", samplerate, bitspersample, mode, minpos, secpos, mindur, secdur, pl_getcount ()); + snprintf (sbtext_new, 512, "[%s] %dHz | %d bit | %s | %d:%02d / %d:%02d | %d songs total", str_playing_song.filetype ? str_playing_song.filetype:"-", samplerate, bitspersample, mode, minpos, secpos, mindur, secdur, pl_getcount ()); } if (strcmp (sbtext_new, sb_text)) { @@ -135,7 +135,7 @@ update_songinfo (void) { if (mainwin) { GtkWidget *widget = lookup_widget (mainwin, "seekbar"); // translate volume to seekbar pixels - songpos /= playlist_current.duration; + songpos /= str_playing_song.duration; songpos *= widget->allocation.width; if ((int)(songpos*2) != (int)(last_songpos*2)) { GDK_THREADS_ENTER(); |