Mercurial > hg > xmms-sid
diff src/xmms-sid.cc @ 22:ac2972a7ccd5
Fixed typos and stuff.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 04 Jun 2003 21:22:04 +0000 |
parents | 5b7009eef767 |
children | 271be59be975 |
line wrap: on
line diff
--- a/src/xmms-sid.cc Wed Jun 04 21:21:05 2003 +0000 +++ b/src/xmms-sid.cc Wed Jun 04 21:22:04 2003 +0000 @@ -22,6 +22,8 @@ */ #include "xmms-sid.h" +#include "xs_config.h" +#include "xs_length.h" #include <sidplay/player.h> #include <sidplay/myendian.h> #include <sidplay/fformat.h> @@ -86,6 +88,12 @@ xs_status.s_allownext = 1; // Initialize to TRUE to allow first song xs_status.s_tune = NULL; xs_status.s_fname = NULL; + + /* Read song-length database */ + if (xs_songlen_init() < 0) + { + XSERR("Error initializing song-length database!\n"); + } /* Initialize STIL structures */ // FIXME FIXME FIx ME @@ -103,12 +111,12 @@ XSDEBUG("shutting down...\n"); /* Stop playing */ - xmms_sid_ip.stop(); + xs_plugin_ip.stop(); /* Free allocated memory */ + xs_songlen_close(); // FIXME FIXME: STIL-entries, songlendb - } @@ -186,8 +194,8 @@ /* Get song information */ xs_status.s_tune->getInfo(plr_sidInf); - plr_tune_len = xs_get_length(xs_status.s_fname, plr_tune_num); - plr_tune_title = xs_get_filetitle(&plr_sidInf, plr_tune_num); + plr_tune_len = xs_songlen_get(xs_status.s_fname, plr_tune_num); + plr_tune_title = xs_filetitle_get(&plr_sidInf, plr_tune_num); XSDEBUG("title='%s', len=%d\n", plr_tune_title, plr_tune_len); @@ -518,9 +526,9 @@ delete testTune; /* Get titlestring */ - *songTitle = xs_get_filetitle(&sidInf, sidInf.startSong); + *songTitle = xs_filetitle_get(&sidInf, sidInf.startSong); /* Get song length (in seconds), negative if no known length */ - *songLength = xs_get_length(songFilename, sidInf.startSong); + *songLength = xs_songlen_get(songFilename, sidInf.startSong); }