comparison src/xmms-sid.cc @ 42:0f00ebab063d

Fixes
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 19 Jun 2003 23:50:01 +0000
parents 1788f4ce6a44
children 90cd38b28a72
comparison
equal deleted inserted replaced
41:c145ff12f2d0 42:0f00ebab063d
27 #include <errno.h> 27 #include <errno.h>
28 #include <xmms/plugin.h> 28 #include <xmms/plugin.h>
29 #include <xmms/util.h> 29 #include <xmms/util.h>
30 #include <xmms/titlestring.h> 30 #include <xmms/titlestring.h>
31 #include "xmms-sid.h" 31 #include "xmms-sid.h"
32 #include "xs_interface.h"
33 #include "xs_glade.h"
32 #include "xs_support.h" 34 #include "xs_support.h"
33 #include "xs_config.h" 35 #include "xs_config.h"
34 #include "xs_length.h" 36 #include "xs_length.h"
35 } 37 }
36 38
53 static emuEngine xs_emuEngine; 55 static emuEngine xs_emuEngine;
54 typedef sidTune t_xs_tune; 56 typedef sidTune t_xs_tune;
55 #endif 57 #endif
56 58
57 #ifdef HAVE_SIDPLAY2 59 #ifdef HAVE_SIDPLAY2
58 #endif 60 static sidplay2 xs_emuEngine;
59 61 #endif
62
63 static GtkWidget *xs_ctrlwin = NULL;
60 static pthread_t xs_decode_thread; 64 static pthread_t xs_decode_thread;
61 struct t_xs_cfg xs_cfg; 65 struct t_xs_cfg xs_cfg;
62 66
63 struct { 67 struct {
64 gboolean isError, isPlaying, allowNext; 68 gboolean isError, isPlaying, allowNext;
66 t_xs_tune *currTune; 70 t_xs_tune *currTune;
67 gchar *currFilename; 71 gchar *currFilename;
68 } xs_status; 72 } xs_status;
69 73
70 pthread_mutex_t xs_mutex = PTHREAD_MUTEX_INITIALIZER; 74 pthread_mutex_t xs_mutex = PTHREAD_MUTEX_INITIALIZER;
75
76 /*
77 * Create sub-song control window
78 */
79 void xs_ctrlwin_open(void)
80 {
81 /* Create sub-song control window */
82 if (xs_ctrlwin != NULL)
83 {
84 gdk_window_raise(xs_ctrlwin->window);
85 return;
86 }
87
88 xs_ctrlwin = create_xs_ctrlwin();
89 gtk_widget_show(xs_ctrlwin);
90 }
71 91
72 92
73 /* 93 /*
74 * Initialize XMMS-SID 94 * Initialize XMMS-SID
75 */ 95 */
109 { 129 {
110 XSERR("Error initializing song-length database!\n"); 130 XSERR("Error initializing song-length database!\n");
111 } 131 }
112 132
113 /* Initialize STIL structures */ 133 /* Initialize STIL structures */
134
135 xs_ctrlwin_open();
136
114 // FIXME FIXME FIx ME 137 // FIXME FIXME FIx ME
115 138
116 /* Create sub-song control window */
117 // FIX ME FIXME
118 } 139 }
119 140
120 141
121 /* 142 /*
122 * Shut down XMMS-SID 143 * Shut down XMMS-SID