Mercurial > hg > xmms-sid
annotate src/xmms-sid.h @ 777:15f0c8e11338
Increase line buffer size in songlength database reader. Fixes problems with
extremely long entries.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 06 Nov 2012 12:11:32 +0200 |
| parents | 64e7e427a436 |
| children | 37ab2fba30c8 |
| rev | line source |
|---|---|
| 1 | 1 /* |
| 3 | 2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS) |
| 1 | 3 |
| 4 Main header file | |
| 5 | |
| 324 | 6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org> |
| 723 | 7 (C) Copyright 1999-2009 Tecnic Software productions (TNSP) |
| 1 | 8 |
| 9 This program is free software; you can redistribute it and/or modify | |
| 10 it under the terms of the GNU General Public License as published by | |
| 11 the Free Software Foundation; either version 2 of the License, or | |
| 12 (at your option) any later version. | |
| 13 | |
| 14 This program is distributed in the hope that it will be useful, | |
| 15 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 17 GNU General Public License for more details. | |
| 18 | |
|
412
7f694e5a1493
Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
19 You should have received a copy of the GNU General Public License along |
|
7f694e5a1493
Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
20 with this program; if not, write to the Free Software Foundation, Inc., |
|
7f694e5a1493
Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
402
diff
changeset
|
21 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
| 1 | 22 */ |
|
526
fa95d942f226
Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
23 #ifndef XMMS_SID_H |
|
fa95d942f226
Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
24 #define XMMS_SID_H |
| 1 | 25 |
|
465
ba98fdac6307
Moved some things to xs_support.h; t_xs_subtuneinfo.tuneSpeed is now the
Matti Hamalainen <ccr@tnsp.org>
parents:
459
diff
changeset
|
26 #include "xs_support.h" |
| 1 | 27 |
| 230 | 28 #ifdef __cplusplus |
| 29 extern "C" { | |
| 30 #endif | |
| 31 | |
| 434 | 32 /* |
|
241
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
33 * Some constants and defines |
|
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
34 */ |
|
365
5a92a2aee74c
Better comments and .. you guessed it: more indentation fixes. :)
Matti Hamalainen <ccr@tnsp.org>
parents:
355
diff
changeset
|
35 /* #define to enable spurious debugging messages for development |
|
5a92a2aee74c
Better comments and .. you guessed it: more indentation fixes. :)
Matti Hamalainen <ccr@tnsp.org>
parents:
355
diff
changeset
|
36 * purposes. Output goes to stderr. See also DEBUG_NP below. |
|
5a92a2aee74c
Better comments and .. you guessed it: more indentation fixes. :)
Matti Hamalainen <ccr@tnsp.org>
parents:
355
diff
changeset
|
37 */ |
| 524 | 38 #define DEBUG |
| 300 | 39 |
| 40 /* Define to ISO C99 macro for debugging instead of varargs function. | |
|
365
5a92a2aee74c
Better comments and .. you guessed it: more indentation fixes. :)
Matti Hamalainen <ccr@tnsp.org>
parents:
355
diff
changeset
|
41 * This provides more useful information, but is incompatible with |
|
5a92a2aee74c
Better comments and .. you guessed it: more indentation fixes. :)
Matti Hamalainen <ccr@tnsp.org>
parents:
355
diff
changeset
|
42 * older standards. If #undef'd, a varargs function is used instead. |
| 300 | 43 */ |
|
308
ae5795ba5c77
Remove "only when song-length unknown" option from minimum playtime, it
Matti Hamalainen <ccr@tnsp.org>
parents:
300
diff
changeset
|
44 #define DEBUG_NP |
| 230 | 45 |
| 272 | 46 /* Define to enable non-portable thread and mutex debugging code. |
| 300 | 47 * You need to #define DEBUG also to make this useful. |
| 48 * (Works probably with GNU/Linux pthreads implementation only) | |
| 272 | 49 */ |
|
241
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
50 #undef XS_MUTEX_DEBUG |
|
72
e3b205a6bc7e
Lots re-arranging and new code for upcoming modularization.
Matti Hamalainen <ccr@tnsp.org>
parents:
65
diff
changeset
|
51 |
| 272 | 52 /* HardSID-support is not working and is untested, thus we disable it here. |
| 53 */ | |
|
241
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
54 #undef HAVE_HARDSID_BUILDER |
|
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
55 |
|
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
56 /* Size for some small buffers (always static variables) */ |
|
777
15f0c8e11338
Increase line buffer size in songlength database reader. Fixes problems with
Matti Hamalainen <ccr@tnsp.org>
parents:
752
diff
changeset
|
57 #define XS_BUF_SIZE (512) |
|
15f0c8e11338
Increase line buffer size in songlength database reader. Fixes problems with
Matti Hamalainen <ccr@tnsp.org>
parents:
752
diff
changeset
|
58 |
|
15f0c8e11338
Increase line buffer size in songlength database reader. Fixes problems with
Matti Hamalainen <ccr@tnsp.org>
parents:
752
diff
changeset
|
59 #define XS_BUF2_SIZE (4096) |
| 1 | 60 |
|
355
26079ab52fc3
Comment about XS_DYNAMIC_BUF changed
Matti Hamalainen <ccr@tnsp.org>
parents:
334
diff
changeset
|
61 /* If defined, some dynamically allocated temp. buffers are used. |
|
26079ab52fc3
Comment about XS_DYNAMIC_BUF changed
Matti Hamalainen <ccr@tnsp.org>
parents:
334
diff
changeset
|
62 * Static (#undef) might give slight performance gain, |
|
26079ab52fc3
Comment about XS_DYNAMIC_BUF changed
Matti Hamalainen <ccr@tnsp.org>
parents:
334
diff
changeset
|
63 * but fails on systems with limited stack space. */ |
|
241
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
64 #define XS_BUF_DYNAMIC |
|
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
65 |
|
546
70fe31fe2bf5
Reordering cleanup and added constant for SIDPlay2 max # of filter coeffs.
Matti Hamalainen <ccr@tnsp.org>
parents:
534
diff
changeset
|
66 /* Configuration section identifier |
|
70fe31fe2bf5
Reordering cleanup and added constant for SIDPlay2 max # of filter coeffs.
Matti Hamalainen <ccr@tnsp.org>
parents:
534
diff
changeset
|
67 */ |
| 752 | 68 #define XS_PACKAGE_STRING PACKAGE_STRING |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
69 #define XS_CONFIG_IDENT "XMMS-SID" |
|
546
70fe31fe2bf5
Reordering cleanup and added constant for SIDPlay2 max # of filter coeffs.
Matti Hamalainen <ccr@tnsp.org>
parents:
534
diff
changeset
|
70 |
|
486
4c599be2d349
Default audio rendering frequency #define.
Matti Hamalainen <ccr@tnsp.org>
parents:
478
diff
changeset
|
71 /* Default audio rendering frequency in Hz |
|
4c599be2d349
Default audio rendering frequency #define.
Matti Hamalainen <ccr@tnsp.org>
parents:
478
diff
changeset
|
72 */ |
| 752 | 73 #define XS_AUDIO_FREQ (44100) |
|
486
4c599be2d349
Default audio rendering frequency #define.
Matti Hamalainen <ccr@tnsp.org>
parents:
478
diff
changeset
|
74 |
| 242 | 75 /* Size of audio buffer. If you are experiencing lots of audio |
| 76 * "underruns" or clicks/gaps in output, try increasing this value. | |
| 77 * Do notice, however, that it also affects the update frequency of | |
| 78 * XMMS's visualization plugins... | |
| 79 */ | |
| 752 | 80 #define XS_AUDIOBUF_SIZE (2*1024) |
| 230 | 81 |
|
241
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
82 /* Size of data buffer used for SID-tune MD5 hash calculation. |
|
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
83 * If this is too small, the computed hash will be incorrect. |
|
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
84 * Largest SID files I've seen are ~70kB. */ |
| 752 | 85 #define XS_SIDBUF_SIZE (80*1024) |
| 230 | 86 |
|
546
70fe31fe2bf5
Reordering cleanup and added constant for SIDPlay2 max # of filter coeffs.
Matti Hamalainen <ccr@tnsp.org>
parents:
534
diff
changeset
|
87 /* libSIDPlay1/2 constants (copied from internal headers/source) |
|
70fe31fe2bf5
Reordering cleanup and added constant for SIDPlay2 max # of filter coeffs.
Matti Hamalainen <ccr@tnsp.org>
parents:
534
diff
changeset
|
88 * For some stupid reason these are not available in public |
|
70fe31fe2bf5
Reordering cleanup and added constant for SIDPlay2 max # of filter coeffs.
Matti Hamalainen <ccr@tnsp.org>
parents:
534
diff
changeset
|
89 * headers, so we have to duplicate them here... |
|
70fe31fe2bf5
Reordering cleanup and added constant for SIDPlay2 max # of filter coeffs.
Matti Hamalainen <ccr@tnsp.org>
parents:
534
diff
changeset
|
90 */ |
| 752 | 91 #define XS_SIDPLAY1_FS (400.0f) |
| 92 #define XS_SIDPLAY1_FM (60.0f) | |
| 93 #define XS_SIDPLAY1_FT (0.05f) | |
|
376
b20300813b42
Moved some #defines from xs_config.c to xmms-sid.h; Changed default SID
Matti Hamalainen <ccr@tnsp.org>
parents:
369
diff
changeset
|
94 |
| 752 | 95 #define XS_SIDPLAY2_NFPOINTS (0x800) |
| 96 #define XS_SIDPLAY2_FMAX (24000) | |
|
62
0d1df20745dd
Started to rewrite STIL-support
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
97 |
| 230 | 98 |
| 99 /* Macros for mutexes and threads. These exist to be able to | |
| 100 * easily change from pthreads to glib threads, etc, if necessary. | |
| 101 */ | |
| 752 | 102 #define XS_THREAD_T pthread_t |
| 103 #define XS_THREAD_EXIT(M) pthread_exit(M) | |
| 104 #define XS_THREAD_JOIN(M) pthread_join(M, NULL) | |
| 105 #define XS_MPP(M) M ## _mutex | |
|
640
91056492b156
Fix XS_MUTEX_DEBUG to work again.
Matti Hamalainen <ccr@tnsp.org>
parents:
632
diff
changeset
|
106 #ifdef XS_MUTEX_DEBUG |
|
91056492b156
Fix XS_MUTEX_DEBUG to work again.
Matti Hamalainen <ccr@tnsp.org>
parents:
632
diff
changeset
|
107 # ifndef __USE_GNU |
|
91056492b156
Fix XS_MUTEX_DEBUG to work again.
Matti Hamalainen <ccr@tnsp.org>
parents:
632
diff
changeset
|
108 # define __USE_GNU |
|
91056492b156
Fix XS_MUTEX_DEBUG to work again.
Matti Hamalainen <ccr@tnsp.org>
parents:
632
diff
changeset
|
109 # endif |
| 752 | 110 # define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP; gint M ## _qq |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
111 # define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M); extern gint M ## _qq |
| 752 | 112 # define XS_MUTEX_LOCK(M) { M ## _qq = pthread_mutex_lock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_LOCK(" #M ") == %i\n", M ## _qq); } |
| 113 # define XS_MUTEX_UNLOCK(M) { M ## _qq = pthread_mutex_unlock(&XS_MPP(M)); if (M ## _qq) XSDEBUG("XS_MUTEX_UNLOCK(" #M ") == %i\n", M ## _qq); } | |
|
241
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
114 #else |
| 752 | 115 # define XS_MUTEX(M) pthread_mutex_t XS_MPP(M) = PTHREAD_MUTEX_INITIALIZER |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
116 # define XS_MUTEX_H(M) extern pthread_mutex_t XS_MPP(M) |
| 752 | 117 # define XS_MUTEX_LOCK(M) pthread_mutex_lock(&XS_MPP(M)) |
| 118 # define XS_MUTEX_UNLOCK(M) pthread_mutex_unlock(&XS_MPP(M)) | |
|
241
291715a519e2
Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
119 #endif |
|
640
91056492b156
Fix XS_MUTEX_DEBUG to work again.
Matti Hamalainen <ccr@tnsp.org>
parents:
632
diff
changeset
|
120 #include <pthread.h> |
| 230 | 121 |
|
622
d7389ea52113
Move SLDB and STIL utility functions to xs_slsup.[ch] and amend some changes between XMMS-SID and Aud-SID via a macro mess.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
122 /* Character set conversion helper macros |
|
d7389ea52113
Move SLDB and STIL utility functions to xs_slsup.[ch] and amend some changes between XMMS-SID and Aud-SID via a macro mess.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
123 */ |
| 752 | 124 #define XS_CS_FILENAME(M) g_strdup(M) |
| 125 #define XS_CS_SID(M) g_strdup(M) | |
| 126 #define XS_CS_STIL(M) M | |
|
622
d7389ea52113
Move SLDB and STIL utility functions to xs_slsup.[ch] and amend some changes between XMMS-SID and Aud-SID via a macro mess.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
127 #define XS_CS_FREE(M) |
|
d7389ea52113
Move SLDB and STIL utility functions to xs_slsup.[ch] and amend some changes between XMMS-SID and Aud-SID via a macro mess.
Matti Hamalainen <ccr@tnsp.org>
parents:
619
diff
changeset
|
128 |
| 230 | 129 /* Shorthands for linked lists |
| 130 */ | |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
131 #define LPREV (node->prev) |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
132 #define LTHIS (node) |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
133 #define LNEXT (node->next) |
|
62
0d1df20745dd
Started to rewrite STIL-support
Matti Hamalainen <ccr@tnsp.org>
parents:
50
diff
changeset
|
134 |
|
72
e3b205a6bc7e
Lots re-arranging and new code for upcoming modularization.
Matti Hamalainen <ccr@tnsp.org>
parents:
65
diff
changeset
|
135 |
| 230 | 136 /* Plugin-wide typedefs |
| 137 */ | |
|
72
e3b205a6bc7e
Lots re-arranging and new code for upcoming modularization.
Matti Hamalainen <ccr@tnsp.org>
parents:
65
diff
changeset
|
138 typedef struct { |
| 752 | 139 gint tuneSpeed, |
| 140 tuneLength; | |
| 141 gboolean tunePlayed; | |
| 751 | 142 } XSSubTuneInfo; |
|
78
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
143 |
|
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
144 |
|
ab522ab65c85
Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents:
73
diff
changeset
|
145 typedef struct { |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
146 gchar *sidFilename, |
| 752 | 147 *sidName, |
| 148 *sidComposer, | |
| 149 *sidCopyright, | |
| 150 *sidFormat; | |
| 151 gint loadAddr, | |
| 152 initAddr, | |
| 153 playAddr, | |
| 154 dataFileLen, | |
| 155 sidModel; | |
| 156 gint nsubTunes, startTune; | |
| 751 | 157 XSSubTuneInfo *subTunes; |
| 158 } XSTuneInfo; | |
| 230 | 159 |
| 160 | |
| 161 /* Global variables | |
| 162 */ | |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
163 extern InputPlugin xs_plugin_ip; |
| 230 | 164 |
| 165 | |
| 166 /* Plugin function prototypes | |
| 1 | 167 */ |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
168 void xs_init(void); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
169 void xs_reinit(void); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
170 void xs_close(void); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
171 gint xs_is_our_file(gchar *); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
172 void xs_play_file(gchar *); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
173 void xs_stop(void); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
174 void xs_pause(short); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
175 void xs_seek(gint); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
176 gint xs_get_time(void); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
177 void xs_get_song_info(gchar *, gchar **, gint *); |
|
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
178 void xs_about(void); |
| 1 | 179 |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
180 void xs_error(const char *, ...); |
| 1 | 181 |
|
427
2ea3005a4b7f
Conditional #definition of _()
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
182 |
|
2ea3005a4b7f
Conditional #definition of _()
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
183 /* Debugging |
|
2ea3005a4b7f
Conditional #definition of _()
Matti Hamalainen <ccr@tnsp.org>
parents:
424
diff
changeset
|
184 */ |
| 300 | 185 #ifndef DEBUG_NP |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
186 void XSDEBUG(const char *, ...); |
| 300 | 187 #else |
| 532 | 188 # ifdef DEBUG |
| 189 # define XSDEBUG(...) { fprintf(stderr, "XS[%s:%s:%d]: ", __FILE__, __FUNCTION__, (int) __LINE__); fprintf(stderr, __VA_ARGS__); } | |
| 190 # else | |
| 191 # define XSDEBUG(...) /* stub */ | |
| 192 # endif | |
| 300 | 193 #endif |
| 1 | 194 |
|
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
195 |
|
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
196 /* And even some Gtk+ macro crap here, yay. |
|
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
197 */ |
| 752 | 198 #define XS_DEF_WINDOW_DELETE(ME, MV) \ |
| 199 gboolean xs_ ## ME ## _delete(GtkWidget *w, GdkEvent *e, gpointer d) { \ | |
| 200 (void) w; (void) e; (void) d; \ | |
| 201 if (xs_ ## MV ) { \ | |
| 202 gtk_widget_destroy(xs_ ## MV ); \ | |
| 203 xs_ ## MV = NULL; \ | |
| 204 } \ | |
| 205 return FALSE; \ | |
|
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
206 } |
|
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
207 |
| 752 | 208 #define XS_DEF_WINDOW_CLOSE(ME, MV) \ |
| 209 void xs_ ## ME (GtkButton *b, gpointer d) { \ | |
| 210 (void) b; (void) d; \ | |
| 211 gtk_widget_destroy(xs_ ## MV ); \ | |
| 212 xs_ ## MV = NULL; \ | |
|
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
213 } |
|
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
214 |
| 752 | 215 #define XS_SIGNAL_CONNECT(SOBJ, SNAME, SFUNC, SDATA) \ |
|
660
b0743dc9165d
Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents:
657
diff
changeset
|
216 gtk_signal_connect(GTK_OBJECT(SOBJ), SNAME, GTK_SIGNAL_FUNC(SFUNC), SDATA) |
|
612
32fc27395220
About window wasn't handling delete_event properly, fixed; Cleaned up event handling a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
610
diff
changeset
|
217 |
|
665
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
218 #define XS_WINDOW_PRESENT(SWIN) gdk_window_raise(SWIN ->window) |
|
94186706beed
Use macro wrapping for Gtk+ v1 vs v2 differences, yet again.
Matti Hamalainen <ccr@tnsp.org>
parents:
660
diff
changeset
|
219 |
| 1 | 220 #ifdef __cplusplus |
| 221 } | |
| 222 #endif | |
|
526
fa95d942f226
Header cleanup; Moved some types from xmms-sid.h to xs_player.h; Renamed few functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
524
diff
changeset
|
223 #endif /* XMMS_SID_H */ |