Mercurial > hg > xmms-sid
changeset 235:d04191d1ea64
Add xs_fileinfo.h, move appropriate function prototypes there.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 21 Dec 2004 13:34:02 +0000 |
| parents | 6f9764fbd693 |
| children | 3a20cf796c63 |
| files | src/xmms-sid.c src/xmms-sid.h src/xs_fileinfo.h src/xs_init.c |
| diffstat | 4 files changed, 24 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmms-sid.c Tue Dec 21 13:34:00 2004 +0000 +++ b/src/xmms-sid.c Tue Dec 21 13:34:02 2004 +0000 @@ -19,33 +19,23 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <pthread.h> - -#ifdef HAVE_STRING_H -#include <string.h> -#else -#ifdef HAVE_STRINGS_H -#include <strings.h> -#endif -#endif - -#include <stdio.h> +#include "xmms-sid.h" +#include "xs_support.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif -#include <errno.h> - #include <xmms/plugin.h> #include <xmms/util.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "xs_support.h" + #include "xs_config.h" #include "xs_length.h" #include "xs_stil.h" +#include "xs_fileinfo.h" #include "xs_interface.h" #include "xs_glade.h" @@ -350,7 +340,7 @@ while (xs_status.isPlaying && (xs_status.currSong == myStatus.currSong) && ((guint) xs_plugin_ip.output->buffer_free() < audioGot)) - xmms_usleep(5000); + xmms_usleep(500); /* Output audio */ if (xs_status.isPlaying && (xs_status.currSong == myStatus.currSong)) @@ -444,7 +434,7 @@ /* Start the playing thread! */ if (pthread_create(&xs_decode_thread, NULL, xs_playthread, NULL) < 0) { - XSERR("Couldn't start playing thread! Possible reason reported by system: %s\n", strerror(errno)); + XSERR("Couldn't start playing thread!\n"); xs_tuneinfo_free(xs_status.tuneInfo); xs_status.tuneInfo = NULL; xs_status.sidPlayer->plrDeleteSID(&xs_status);
--- a/src/xmms-sid.h Tue Dec 21 13:34:00 2004 +0000 +++ b/src/xmms-sid.h Tue Dec 21 13:34:02 2004 +0000 @@ -163,9 +163,8 @@ void xs_seek(gint); gint xs_get_time(void); void xs_get_song_info(gchar *, gchar **, gint *); -void xs_fileinfo(gchar *); void xs_about(void); -void xs_set_subtune(gint); + t_xs_tuneinfo *xs_tuneinfo_new(gchar *, gint, gint, gchar *, gchar *, gchar *, gint, gint, gint, gint); void xs_tuneinfo_free(t_xs_tuneinfo *);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/xs_fileinfo.h Tue Dec 21 13:34:02 2004 +0000 @@ -0,0 +1,16 @@ +#ifndef XS_FILEINFO_H +#define XS_FILEINFO_H + +#include "xmms-sid.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void xs_fileinfo_update(void); +void xs_fileinfo(gchar *); + +#ifdef __cplusplus +} +#endif +#endif /* XS_FILEINFO_H */