diff options
author | waker <wakeroid@gmail.com> | 2009-08-29 21:36:19 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2009-08-29 21:36:19 +0200 |
commit | f4d508b243888a9dbe79b5916e497254d370e35a (patch) | |
tree | 48846519dfc51a3d44991b3b4b18a2efda5083f0 /main.c | |
parent | 003a54afeba00597fd2f50e38ccd35c7cd5e4e39 (diff) |
mp3 decoder porting as plugin WIP
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -95,17 +95,17 @@ update_songinfo (void) { else if (p_isstopped ()) { strcpy (sbtext_new, "Stopped"); } - else if (playlist_current.codec) { + else if (playlist_current.decoder) { codec_lock (); - codec_t *c = playlist_current.codec; + DB_decoder_t *c = playlist_current.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; const char *mode = c->info.channels == 1 ? "Mono" : "Stereo"; - int samplerate = c->info.samplesPerSecond; - int bitspersample = c->info.bitsPerSample; + int samplerate = c->info.samplerate; + int bitspersample = c->info.bps; songpos = playpos; codec_unlock (); @@ -575,9 +575,9 @@ main (int argc, char *argv[]) { server_start (); conf_load (); + plug_load_all (); pl_load (defpl); session_load (sessfile); - plug_load_all (); messagepump_init (); codec_init_locking (); streamer_init (); |