# HG changeset patch # User Matti Hamalainen # Date 1054989725 0 # Node ID 271be59be975ce2d2e316f772bddb95af6f0f50a # Parent 469efc05e01ed33848e816261436f862b1e312ef Lots of changes diff -r 469efc05e01e -r 271be59be975 src/Makefile.am --- a/src/Makefile.am Sat Jun 07 12:42:05 2003 +0000 +++ b/src/Makefile.am Sat Jun 07 12:42:05 2003 +0000 @@ -12,12 +12,13 @@ libxmmssid_la_SOURCES = \ xmms-sid.cc xmms-sid.h \ xs_init.c \ - xs_title.cc \ + xs_about.c \ + xs_title.cc xs_title.h \ xs_support.c xs_support.h \ xs_config.c xs_config.h \ xs_md5.c xs_md5.h \ xs_length.c xs_length.h \ - xs_stil.c xs_stil.h \ xs_genui.c xs_genui.h \ xs_glade.c xs_glade.h \ xs_interface.c xs_interface.h +# xs_stil.c xs_stil.h \ diff -r 469efc05e01e -r 271be59be975 src/xmms-sid.cc --- a/src/xmms-sid.cc Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xmms-sid.cc Sat Jun 07 12:42:05 2003 +0000 @@ -24,6 +24,7 @@ #include "xmms-sid.h" #include "xs_config.h" #include "xs_length.h" +#include "xs_title.h" #include #include #include @@ -169,7 +170,7 @@ */ static void *xs_play_loop(void *argPointer) { - gchar plr_data[XMMS_SID_BUFSIZE]; + gchar plr_data[XS_BUFSIZE]; struct sidTuneInfo plr_sidInf; gchar *plr_tune_title = NULL; gint plr_fxlen; @@ -206,7 +207,7 @@ plr_fmt = (xs_emuConf.bitsPerSample == 16) ? FMT_S16_NE : FMT_U8; - if (!xmms_sid_ip.output->open_audio(plr_fmt, xs_emuConf.frequency, xs_emuConf.channels)) + if (!xs_plugin_ip.output->open_audio(plr_fmt, xs_emuConf.frequency, xs_emuConf.channels)) { pthread_mutex_lock(&xs_mutex); xs_status.s_error = 1; @@ -230,7 +231,7 @@ /* Set song title information */ - xmms_sid_ip.set_info( + xs_plugin_ip.set_info( plr_tune_title, (plr_tune_len * 1000), (1000 * (plr_sidInf.songSpeed ? plr_sidInf.songSpeed : (plr_sidInf.clockSpeed == SIDTUNE_CLOCK_NTSC) ? 60 : 50)), @@ -241,7 +242,7 @@ /* Run playing loop: loop as long as xs_playing is same as current tune number */ while (xs_status.s_playing == plr_tune_num) { - plr_fxlen = XMMS_SID_BUFSIZE; + plr_fxlen = XS_BUFSIZE; /* Run emulator to fill output buffer with audio data */ sidEmuFillBuffer(xs_emuEngine, *xs_status.s_tune, plr_data, plr_fxlen); @@ -249,7 +250,7 @@ /* If Max Playtime option set, check playtime */ if (xs_cfg.playUseMaxTime) { - if ((xmms_sid_ip.output->output_time() / 1000) >= xs_cfg.playMaxTime) + if ((xs_plugin_ip.output->output_time() / 1000) >= xs_cfg.playMaxTime) { pthread_mutex_lock(&xs_mutex); xs_status.s_playing = 0; @@ -260,7 +261,7 @@ /* Check playtime against database */ if (xs_cfg.playMethod == XMMS_SID_PMETHOD_DATABASE) { - if ((xmms_sid_ip.output->output_time() / 1000) >= plr_tune_len) + if ((xs_plugin_ip.output->output_time() / 1000) >= plr_tune_len) { pthread_mutex_lock(&xs_mutex); xs_status.s_playing = 0; @@ -284,17 +285,17 @@ /* Send audio data to visualization plugin */ - xmms_sid_ip.add_vis_pcm(xmms_sid_ip.output->written_time(), + xs_plugin_ip.add_vis_pcm(xs_plugin_ip.output->written_time(), plr_fmt, xs_emuConf.channels, plr_fxlen, plr_data); /* Wait for a while */ - while ((xs_status.s_playing == plr_tune_num) && (xmms_sid_ip.output->buffer_free() < plr_fxlen)) + while ((xs_status.s_playing == plr_tune_num) && (xs_plugin_ip.output->buffer_free() < plr_fxlen)) xmms_usleep(10000); /* If playing, send final audio data to output plugin */ if (xs_status.s_playing == plr_tune_num) - xmms_sid_ip.output->write_audio(plr_data, plr_fxlen); + xs_plugin_ip.output->write_audio(plr_data, plr_fxlen); } /* End of playerloop */ @@ -303,7 +304,7 @@ XSDEBUG("cleaning up...\n"); /* Cleanup & shutdown */ - xmms_sid_ip.output->close_audio(); + xs_plugin_ip.output->close_audio(); if (plr_tune_title) g_free(plr_tune_title); @@ -465,7 +466,7 @@ */ void xs_pause(short pauseState) { - xmms_sid_ip.output->pause(pauseState); + xs_plugin_ip.output->pause(pauseState); } @@ -501,7 +502,7 @@ set_song_position(xs_status.s_playing, 1, xs_status.s_songs); #endif - return xmms_sid_ip.output->output_time(); + return xs_plugin_ip.output->output_time(); } diff -r 469efc05e01e -r 271be59be975 src/xmms-sid.h --- a/src/xmms-sid.h Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xmms-sid.h Sat Jun 07 12:42:05 2003 +0000 @@ -29,15 +29,15 @@ extern "C" { #endif +#include #include #include /* * Generals */ -#define XMMS_SID_NAME "XMMS-SID" /* Plugin name */ -#define XMMS_SID_CONFIG_IDENT "XMMS-SID" /* Configuration file identifier */ -#define XMMS_SID_BUFSIZE 4096 /* Size for some buffers */ +#define XS_CONFIG_IDENT "XMMS-SID" /* Configuration file identifier */ +#define XS_BUFSIZE (4096) /* Size for some buffers */ extern InputPlugin xs_plugin_ip; @@ -56,9 +56,8 @@ int xs_get_time(void); void xs_get_song_info(char *, char **, int *); // void xs_file_info_box(char *); - +void xs_aboutbox(void); -#define LWW lookup_widget /* * Debugging and error handling macros @@ -69,7 +68,7 @@ #define XSDEBUG(x...) /* foo */ #endif -#define XSERR(x...) { fprintf(stderr, XMMS_SID_NAME ": "); fprintf(stderr, ## x); } +#define XSERR(x...) { fprintf(stderr, PACKAGE_NAME ": "); fprintf(stderr, ## x); } #ifdef __cplusplus diff -r 469efc05e01e -r 271be59be975 src/xs_about.c --- a/src/xs_about.c Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xs_about.c Sat Jun 07 12:42:05 2003 +0000 @@ -41,85 +41,13 @@ */ void xs_aboutbox(void) { - GtkWidget *vbox1, *hbox1, *frame1, *pixmapwid; - GtkWidget *label1, *hbuttonbox1, *about_ok; - GdkPixmap *pixmap; - GdkBitmap *pixmask; - GtkStyle *style; - - /* Check if there already is an open about window */ - if (xs_aboutwin != NULL) { - gdk_window_raise(xs_aboutwin->window); - return; - } - - /* No, create one ... */ - xs_aboutwin = gtk_dialog_new(); - gtk_object_set_data(GTK_OBJECT(xs_aboutwin), "xs_aboutwin", xs_aboutwin); - gtk_window_set_title(GTK_WINDOW(xs_aboutwin), "About xmms-sid SIDPlay plugin"); - gtk_window_set_policy(GTK_WINDOW(xs_aboutwin), FALSE, FALSE, FALSE); - gtk_window_set_position(GTK_WINDOW(xs_aboutwin), GTK_WIN_POS_MOUSE); - gtk_signal_connect(GTK_OBJECT(xs_aboutwin), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &xs_aboutwin); - gtk_container_border_width(GTK_CONTAINER(xs_aboutwin), 10); - - vbox1 = GTK_DIALOG(xs_aboutwin)->vbox; - gtk_object_set_data(GTK_OBJECT(xs_aboutwin), "vbox1", vbox1); - gtk_widget_show(vbox1); -/* gtk_container_add(GTK_CONTAINER(xs_aboutwin), vbox1); -*/ - hbox1 = gtk_hbox_new(FALSE, 0); - gtk_object_set_data(GTK_OBJECT(xs_aboutwin), "hbox1", hbox1); - gtk_widget_show (hbox1); - gtk_box_pack_start(GTK_BOX(vbox1), hbox1, TRUE, TRUE, 0); - - frame1 = gtk_frame_new (NULL); - gtk_object_set_data (GTK_OBJECT (xs_aboutwin), "frame1", frame1); - gtk_widget_show (frame1); - gtk_box_pack_start (GTK_BOX (hbox1), frame1, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame1), 4); - - gtk_widget_realize (xs_aboutwin); + /* Check if there already is an open about window */ + if (xs_aboutwin != NULL) + { + gdk_window_raise(xs_aboutwin->window); + return; + } - /* The pixmap */ - style = gtk_widget_get_style (xs_aboutwin); - pixmap = gdk_pixmap_create_from_xpm_d(xs_aboutwin->window, &pixmask, - &style->bg[GTK_STATE_NORMAL], - (gchar **) xmms_sid_logo_xpm); - - pixmapwid = gtk_pixmap_new(pixmap, pixmask); - gtk_widget_show (pixmapwid); - gtk_container_add (GTK_CONTAINER (frame1), pixmapwid); - gtk_misc_set_padding (GTK_MISC (pixmapwid), 4, 4); - - label1 = gtk_label_new ( - "XMMS-SID SIDPlay plugin v" VERSION "\n" - "for X MultiMedia System\n" - "by Willem Monsuwe and\n" - "Matti \"ccr\" H\344m\344l\344inen\n\n" - "libSIDPlay by Michael Schwendt"); - - gtk_object_set_data (GTK_OBJECT (xs_aboutwin), "label1", label1); - gtk_widget_show (label1); - gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label1), 8, 0); - - hbuttonbox1 = gtk_hbutton_box_new (); - gtk_object_set_data (GTK_OBJECT (xs_aboutwin), "hbuttonbox1", hbuttonbox1); - gtk_widget_show (hbuttonbox1); - gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, TRUE, TRUE, 0); - - /* OK-button */ - about_ok = gtk_button_new_with_label("OK"); - - gtk_signal_connect (GTK_OBJECT (about_ok), "clicked", - GTK_SIGNAL_FUNC(xs_aboutwin_ok), - NULL); - - gtk_object_set_data (GTK_OBJECT (xs_aboutwin), "about_ok", about_ok); - gtk_widget_show (about_ok); - gtk_container_add (GTK_CONTAINER (hbuttonbox1), about_ok); - GTK_WIDGET_SET_FLAGS (about_ok, GTK_CAN_DEFAULT); - - gtk_widget_show(xs_aboutwin); + /* No, create one ... */ } diff -r 469efc05e01e -r 271be59be975 src/xs_config.c --- a/src/xs_config.c Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xs_config.c Sat Jun 07 12:42:05 2003 +0000 @@ -153,19 +153,19 @@ switch (xs_cfgtable[i].atype) { case ATYPE_INT: - xmms_cfg_read_int(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, (gint *) xs_cfgtable[i].adata); + xmms_cfg_read_int(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, (gint *) xs_cfgtable[i].adata); break; case ATYPE_BOOL: - xmms_cfg_read_boolean(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, (gboolean *) xs_cfgtable[i].adata); + xmms_cfg_read_boolean(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, (gboolean *) xs_cfgtable[i].adata); break; case ATYPE_FLOAT: - xmms_cfg_read_float(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, (gfloat *) xs_cfgtable[i].adata); + xmms_cfg_read_float(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, (gfloat *) xs_cfgtable[i].adata); break; case ATYPE_STR: - if (xmms_cfg_read_string(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, (gchar **) &tmpstr)) + if (xmms_cfg_read_string(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, (gchar **) &tmpstr)) { /* Read was successfull */ xs_strcalloc((gchar **) xs_cfgtable[i].adata, tmpstr); @@ -186,7 +186,7 @@ XSDEBUG("OK\n"); } - +#if 0 /* * Configuration panel was canceled */ @@ -306,19 +306,19 @@ switch (xs_cfgtable[i].atype) { case ATYPE_INT: - xmms_cfg_write_int(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, *(gint *) xs_cfgtable[i].adata); + xmms_cfg_write_int(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, *(gint *) xs_cfgtable[i].adata); break; case ATYPE_BOOL: - xmms_cfg_write_boolean(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, *(gboolean *) xs_cfgtable[i].adata); + xmms_cfg_write_boolean(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, *(gboolean *) xs_cfgtable[i].adata); break; case ATYPE_FLOAT: - xmms_cfg_write_float(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, *(gfloat *) xs_cfgtable[i].adata); + xmms_cfg_write_float(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, *(gfloat *) xs_cfgtable[i].adata); break; case ATYPE_STR: - xmms_cfg_write_string(cfg_file, XMMS_SID_CONFIG_IDENT, xs_cfgtable[i].aname, *(gchar **) xs_cfgtable[i].adata); + xmms_cfg_write_string(cfg_file, XS_CONFIG_IDENT, xs_cfgtable[i].aname, *(gchar **) xs_cfgtable[i].adata); break; default: @@ -543,3 +543,7 @@ gtk_widget_show(xs_configwin); } +#endif +void xs_configure(void) +{ +} diff -r 469efc05e01e -r 271be59be975 src/xs_config.h --- a/src/xs_config.h Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xs_config.h Sat Jun 07 12:42:05 2003 +0000 @@ -5,6 +5,7 @@ extern "C" { #endif +#include /* * Configuration structure diff -r 469efc05e01e -r 271be59be975 src/xs_init.c --- a/src/xs_init.c Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xs_init.c Sat Jun 07 12:42:05 2003 +0000 @@ -21,12 +21,13 @@ */ #include "xmms-sid.h" +#include "xs_config.h" InputPlugin xs_plugin_ip = { NULL, /* FILLED BY XMMS */ NULL, /* FILLED BY XMMS */ - XMMS_SID_NAME " " VERSION, /* Plugin description */ + PACKAGE_STRING, /* Plugin description */ xs_init, /* Initialization */ xs_aboutbox, /* Show aboutbox */ xs_configure, /* Show/edit configuration */ diff -r 469efc05e01e -r 271be59be975 src/xs_length.c --- a/src/xs_length.c Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xs_length.c Sat Jun 07 12:42:05 2003 +0000 @@ -115,10 +115,7 @@ while ((!iFound) && ((iEndNode - iStartNode) > 128)) { - fprintf(stderr, "["); - fprinth(stderr, xs_dbindex[iQNode]->md5Hash); r = xs_db_cmphash(pHash, xs_dbindex[iQNode]->md5Hash); - fprintf(stderr, "] = %i\n", r); if (r < 0) { /* Hash was in the <- LEFT side */ @@ -207,7 +204,7 @@ gint xs_db_read(gchar *dbFilename, t_xs_dbentry **dataBase) { FILE *inFile; - gchar inLine[XMMS_SID_BUFSIZE]; + gchar inLine[XS_BUFSIZE]; gint lineNum, linePos, iOK; t_xs_dbentry *tmpNode; @@ -558,7 +555,7 @@ /* * Get song length */ -gint32 xs_get_songlength(gchar *fileName, gint subTune) +gint32 xs_songlen_get(gchar *fileName, gint subTune) { t_xs_dbentry *dbEntry; t_xs_md5hash dbHash; @@ -572,8 +569,6 @@ /* Get the hash and then look up from db */ if (xs_get_sid_hash(fileName, dbHash) == 0) { - fprinth(stderr, dbHash); - fprintf(stderr, "\n"); dbEntry = xs_db_get(dbHash); if (dbEntry) diff -r 469efc05e01e -r 271be59be975 src/xs_title.cc --- a/src/xs_title.cc Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xs_title.cc Sat Jun 07 12:42:05 2003 +0000 @@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "xmms-sid.h" +#include "xs_config.h" +#include "xs_support.h" #include #include #include @@ -30,9 +32,8 @@ /* - * Create the SID-tune description string from the - * tune's information formatted by the user-specified - * format-string. + * Create the SID-tune description string from the tune's information + * formatted by the user-specified format-string. */ gchar *xs_filetitle_get(gchar *pcFilename, void *pfInfo, gint iSubTune) { diff -r 469efc05e01e -r 271be59be975 src/xs_title.h --- a/src/xs_title.h Sat Jun 07 12:42:05 2003 +0000 +++ b/src/xs_title.h Sat Jun 07 12:42:05 2003 +0000 @@ -1,17 +1,10 @@ #ifndef XS_TITLE_H #define XS_TITLE_H -#ifdef __cplusplus -extern "C" { -#endif - /* * Functions */ gchar *xs_filetitle_get(void *, gint); -#ifdef __cplusplus -} -#endif #endif /* XS_TITLE_H */