annotate src/xmms-sid.c @ 1002:ede5374e9294

Fix some warnings.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 21 Dec 2013 07:48:44 +0200
parents 04dc44e87e03
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
1 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
3
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
4 Main source file
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
5
324
dd201740a720 Changed copyright text.
Matti Hamalainen <ccr@tnsp.org>
parents: 313
diff changeset
6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
723
9321ffa2ea7e Update copyright years.
Matti Hamalainen <ccr@tnsp.org>
parents: 714
diff changeset
7 (C) Copyright 1999-2009 Tecnic Software productions (TNSP)
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
8
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
9 This program is free software; you can redistribute it and/or modify
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
10 it under the terms of the GNU General Public License as published by
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
11 the Free Software Foundation; either version 2 of the License, or
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
12 (at your option) any later version.
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
13
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
14 This program is distributed in the hope that it will be useful,
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
17 GNU General Public License for more details.
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
18
412
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 403
diff changeset
19 You should have received a copy of the GNU General Public License along along
7f694e5a1493 Updated GNU GPL (new FSF address) and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 403
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: 403
diff changeset
21 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
22 */
235
d04191d1ea64 Add xs_fileinfo.h, move appropriate function prototypes there.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
23 #include "xmms-sid.h"
223
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of
Matti Hamalainen <ccr@tnsp.org>
parents: 213
diff changeset
24
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of
Matti Hamalainen <ccr@tnsp.org>
parents: 213
diff changeset
25 #ifdef HAVE_STDLIB_H
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of
Matti Hamalainen <ccr@tnsp.org>
parents: 213
diff changeset
26 #include <stdlib.h>
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of
Matti Hamalainen <ccr@tnsp.org>
parents: 213
diff changeset
27 #endif
16e3b2446a73 On some systems stdlib.h has prerequisite of stdio.h, corrected order of
Matti Hamalainen <ccr@tnsp.org>
parents: 213
diff changeset
28
184
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
29 #include <gdk/gdkkeysyms.h>
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
30 #include <gtk/gtk.h>
235
d04191d1ea64 Add xs_fileinfo.h, move appropriate function prototypes there.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
31
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
32 #include "xs_config.h"
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
33 #include "xs_length.h"
103
fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed.
Matti Hamalainen <ccr@tnsp.org>
parents: 99
diff changeset
34 #include "xs_stil.h"
402
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely
Matti Hamalainen <ccr@tnsp.org>
parents: 392
diff changeset
35 #include "xs_title.h"
235
d04191d1ea64 Add xs_fileinfo.h, move appropriate function prototypes there.
Matti Hamalainen <ccr@tnsp.org>
parents: 232
diff changeset
36 #include "xs_fileinfo.h"
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
37 #include "xs_interface.h"
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
38 #include "xs_glade.h"
872
b02f934d8224 Move some code to xs_backend.
Matti Hamalainen <ccr@tnsp.org>
parents: 865
diff changeset
39 #include "xs_backend.h"
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: 606
diff changeset
40 #include "xs_slsup.h"
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: 606
diff changeset
41
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
42
787
8f0d11865742 Move some code around, remove xs_player.c
Matti Hamalainen <ccr@tnsp.org>
parents: 767
diff changeset
43 /* Global variables
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
44 */
751
55eea3fa8868 Rename some structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 748
diff changeset
45 XSEngineState xs_status;
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
46 XS_MUTEX(xs_status);
532
bc548249464a Audacious glue.
Matti Hamalainen <ccr@tnsp.org>
parents: 526
diff changeset
47 static XS_THREAD_T xs_decode_thread;
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
48
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
49 static GtkWidget *xs_subctrl = NULL;
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
50 static GtkObject *xs_subctrl_adj = NULL;
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
51 XS_MUTEX(xs_subctrl);
184
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
52
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
53 void xs_subctrl_close(void);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
54 void xs_subctrl_update(void);
477
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 472
diff changeset
55
147
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
56
297
ac9a484e3430 Make XSERR into function.
Matti Hamalainen <ccr@tnsp.org>
parents: 294
diff changeset
57 /*
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
58 * Initialization functions
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
59 */
147
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
60 void xs_reinit(void)
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
61 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
62 /* Stop playing, if we are */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
63 XS_MUTEX_LOCK(xs_status);
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
64 if (xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
65 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
66 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
67 xs_stop();
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
68 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
69 else
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
70 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
71 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
72 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
73
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
74 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
75 XS_MUTEX_LOCK(xs_cfg);
606
59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info()
Matti Hamalainen <ccr@tnsp.org>
parents: 543
diff changeset
76
809
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
77 // Close player stuff
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
78 xs_tuneinfo_free(xs_status.tuneInfo);
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
79 xs_status.tuneInfo = NULL;
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
80 if (xs_status.engine != NULL)
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
81 {
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
82 xs_status.engine->plrDeleteSID(&xs_status);
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
83 xs_status.engine->plrClose(&xs_status);
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
84 }
8f155eca3612 Shut down/delete player resources at reinit.
Matti Hamalainen <ccr@tnsp.org>
parents: 799
diff changeset
85
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
86 /* Initialize status and sanitize configuration */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
87 memset(&xs_status, 0, sizeof(xs_status));
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
88
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
89 if (xs_cfg.audioFrequency < 8000)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
90 xs_cfg.audioFrequency = 8000;
273
f6daddca03c7 Merging in oversampling support, audio settings sanitation.
Matti Hamalainen <ccr@tnsp.org>
parents: 264
diff changeset
91
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
92 xs_status.audioFrequency = xs_cfg.audioFrequency;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
93 xs_status.audioBitsPerSample = xs_cfg.audioBitsPerSample;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
94 xs_status.audioChannels = xs_cfg.audioChannels;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
95 xs_status.audioFormat = -1;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
96
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
97 /* Try to initialize emulator engine */
875
0fdb001e456c Oops, one argument was missing from xs_init_emu_backend() call.
Matti Hamalainen <ccr@tnsp.org>
parents: 872
diff changeset
98 xs_init_emu_backend(&xs_status, &xs_cfg.playerEngine);
606
59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info()
Matti Hamalainen <ccr@tnsp.org>
parents: 543
diff changeset
99
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
100 /* Get settings back, in case the chosen emulator backend changed them */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
101 xs_cfg.audioFrequency = xs_status.audioFrequency;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
102 xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
103 xs_cfg.audioChannels = xs_status.audioChannels;
273
f6daddca03c7 Merging in oversampling support, audio settings sanitation.
Matti Hamalainen <ccr@tnsp.org>
parents: 264
diff changeset
104
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
105 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
106 XS_MUTEX_UNLOCK(xs_cfg);
606
59046d70c0ef Fixed a thread race conds in xs_reinit() and xs_get_song_info()
Matti Hamalainen <ccr@tnsp.org>
parents: 543
diff changeset
107
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
108 /* Initialize song-length database */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
109 xs_songlen_close();
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
110 if (xs_cfg.songlenDBEnable && (xs_songlen_init() != 0))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
111 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
112 xs_error("Error initializing song-length database!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
113 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
114
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
115 /* Initialize STIL database */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
116 xs_stil_close();
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
117 if (xs_cfg.stilDBEnable && (xs_stil_init() != 0))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
118 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
119 xs_error("Error initializing STIL database!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
120 }
147
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
121 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
122
147
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
123
943
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
124 gboolean xs_configure_pester(gpointer data)
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
125 {
1002
ede5374e9294 Fix some warnings.
Matti Hamalainen <ccr@tnsp.org>
parents: 943
diff changeset
126 (void) data;
ede5374e9294 Fix some warnings.
Matti Hamalainen <ccr@tnsp.org>
parents: 943
diff changeset
127
943
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
128 xs_configure();
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
129
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
130 xs_messagebox(_("Attention!"),
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
131 _("It seems you haven't yet configured XMMS-SID plugin, "
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
132 "or the configuration is from another version. "
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
133 "Opening the configuration dialog for it now."));
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
134 return FALSE;
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
135 }
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
136
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
137
147
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
138 /*
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
139 * Initialize XMMS-SID
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
140 */
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
141 void xs_init(void)
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
142 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
143 XSDEBUG("xs_init()\n");
147
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
144
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
145 /* Initialize and get configuration */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
146 xs_init_configuration();
943
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
147
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
148 if (!xs_read_configuration())
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
149 {
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
150 g_timeout_add(1500, xs_configure_pester, NULL);
04dc44e87e03 Add a automatic pestering dialog if the user has not configured XMMS-SID or
Matti Hamalainen <ccr@tnsp.org>
parents: 879
diff changeset
151 }
147
a7abcda7a86c SLDB, STIL and emulation engine settings are now updated
Matti Hamalainen <ccr@tnsp.org>
parents: 140
diff changeset
152
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
153 /* Initialize subsystems */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
154 xs_reinit();
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
155
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
156 XSDEBUG("OK\n");
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
157 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
158
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
159
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
160 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
161 * Shut down XMMS-SID
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
162 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
163 void xs_close(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
164 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
165 XSDEBUG("xs_close(): shutting down...\n");
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
166
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
167 /* Stop playing, free structures */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
168 xs_stop();
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
169
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
170 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
171 xs_status.tuneInfo = NULL;
794
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
172 if (xs_status.engine != NULL)
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
173 {
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
174 xs_status.engine->plrDeleteSID(&xs_status);
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
175 xs_status.engine->plrClose(&xs_status);
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
176 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
177
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
178 xs_songlen_close();
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
179 xs_stil_close();
87
94497283affa Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents: 84
diff changeset
180
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
181 XSDEBUG("shutdown finished.\n");
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
182 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
183
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
184
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
185 /*
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
186 * Check whether the given file is handled by this plugin
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
187 */
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
188 gint xs_is_our_file(gchar *filename)
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
189 {
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
190 gchar *ext;
760
f6a57c0656fa Handle engine initialization failures a bit more .. "gracefully".
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
191 if (xs_status.engine == NULL)
f6a57c0656fa Handle engine initialization failures a bit more .. "gracefully".
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
192 return FALSE;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
193
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
194 /* Check the filename */
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
195 if (filename == NULL)
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
196 return FALSE;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
197
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
198 /* Try to detect via detection routine, if required */
846
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
199 if (xs_cfg.detectMagic && xs_status.engine->plrProbe != NULL)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
200 {
846
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
201 gboolean res = FALSE;
751
55eea3fa8868 Rename some structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 748
diff changeset
202 XSFile *f;
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
203 if ((f = xs_fopen(filename, "rb")) != NULL)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
204 {
846
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
205 res = xs_status.engine->plrProbe(f);
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
206 xs_fclose(f);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
207 }
846
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
208 return res;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
209 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
210
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
211 /* Detect just by checking filename extension */
763
61a527ac3baa Cleanups, remove useless function.
Matti Hamalainen <ccr@tnsp.org>
parents: 760
diff changeset
212 ext = strrchr(filename, '.');
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
213 if (ext)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
214 {
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
215 ext++;
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
216 switch (xs_cfg.playerEngine)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
217 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
218 case XS_ENG_SIDPLAY1:
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
219 if (!g_strcasecmp(ext, "psid"))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
220 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
221 if (!g_strcasecmp(ext, "sid"))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
222 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
223 if (!g_strcasecmp(ext, "dat"))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
224 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
225 if (!g_strcasecmp(ext, "inf"))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
226 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
227 if (!g_strcasecmp(ext, "info"))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
228 return TRUE;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
229 break;
846
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
230
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
231 case XS_ENG_SIDPLAY2:
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
232 case XS_ENG_SIDPLAYFP:
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
233 if (!g_strcasecmp(ext, "sid"))
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
234 return TRUE;
7b11ba6fc4cc Improve and fix probing (FP backend wasn't used when checking filename
Matti Hamalainen <ccr@tnsp.org>
parents: 839
diff changeset
235 break;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
236 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
237 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
238
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
239 return FALSE;
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
240 }
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
241
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
242
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
243 /*
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
244 * Main playing thread loop
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
245 */
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
246 void *xs_playthread(void *argPointer)
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
247 {
751
55eea3fa8868 Rename some structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 748
diff changeset
248 XSEngineState myStatus;
55eea3fa8868 Rename some structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 748
diff changeset
249 XSTuneInfo *myTune;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
250 gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
251 gint audioGot, songLength, i;
748
d9d769b5dbe2 Remove oversampling support.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
252 gchar *audioBuffer = NULL, *tmpTitle;
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
253
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
254 (void) argPointer;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
255
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
256 /* Initialize */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
257 XSDEBUG("entering player thread\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
258 XS_MUTEX_LOCK(xs_status);
751
55eea3fa8868 Rename some structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 748
diff changeset
259 memcpy(&myStatus, &xs_status, sizeof(XSEngineState));
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
260 myTune = xs_status.tuneInfo;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
261 for (i = 0; i <= myTune->nsubTunes; i++)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
262 myTune->subTunes[i].tunePlayed = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
263 XS_MUTEX_UNLOCK(xs_status);
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
264
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
265 /* Allocate audio buffer */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
266 audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
267 if (audioBuffer == NULL)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
268 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
269 xs_error("Couldn't allocate memory for audio data buffer!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
270 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
271 }
273
f6daddca03c7 Merging in oversampling support, audio settings sanitation.
Matti Hamalainen <ccr@tnsp.org>
parents: 264
diff changeset
272
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
273 /*
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
274 * Main player loop: while not stopped, loop here - play subtunes
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
275 */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
276 audioOpen = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
277 doPlay = TRUE;
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
278 while (xs_status.playing && doPlay)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
279 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
280 /* Automatic sub-tune change logic */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
281 XS_MUTEX_LOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
282 XS_MUTEX_LOCK(xs_status);
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
283 myStatus.playing = TRUE;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
284
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
285 if (xs_status.currSong < 1 || myStatus.currSong < 1)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
286 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
287 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
288 XS_MUTEX_UNLOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
289 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
290 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
291
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
292 if (xs_cfg.subAutoEnable && (myStatus.currSong == xs_status.currSong))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
293 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
294 /* Check if currently selected sub-tune has been played already */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
295 if (myTune->subTunes[myStatus.currSong-1].tunePlayed)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
296 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
297 /* Find a tune that has not been played */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
298 XSDEBUG("tune #%i already played, finding next match ...\n", myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
299 isFound = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
300 i = 0;
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
301 while (!isFound && (++i <= myTune->nsubTunes))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
302 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
303 if (xs_cfg.subAutoMinOnly)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
304 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
305 /* A tune with minimum length must be found */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
306 if (!myTune->subTunes[i-1].tunePlayed &&
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
307 myTune->subTunes[i-1].tuneLength >= xs_cfg.subAutoMinTime)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
308 isFound = TRUE;
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
309 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
310 else
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
311 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
312 /* Any unplayed tune is okay */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
313 if (!myTune->subTunes[i-1].tunePlayed)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
314 isFound = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
315 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
316 }
281
d913f0f69487 Automatic sub-tune changing.
Matti Hamalainen <ccr@tnsp.org>
parents: 277
diff changeset
317
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
318 if (isFound)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
319 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
320 /* Set the new sub-tune */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
321 XSDEBUG("found #%i\n", i);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
322 xs_status.currSong = i;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
323 } else
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
324 /* This is the end */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
325 doPlay = FALSE;
281
d913f0f69487 Automatic sub-tune changing.
Matti Hamalainen <ccr@tnsp.org>
parents: 277
diff changeset
326
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
327 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
328 XS_MUTEX_UNLOCK(xs_cfg);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
329 continue; /* This is ugly, but ... */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
330 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
331 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
332
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
333 /* Tell that we are initializing, update sub-tune controls */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
334 myStatus.currSong = xs_status.currSong;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
335 myTune->subTunes[myStatus.currSong-1].tunePlayed = TRUE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
336 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
337 XS_MUTEX_UNLOCK(xs_cfg);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
338
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
339 XSDEBUG("subtune #%i selected, initializing...\n", myStatus.currSong);
281
d913f0f69487 Automatic sub-tune changing.
Matti Hamalainen <ccr@tnsp.org>
parents: 277
diff changeset
340
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
341 GDK_THREADS_ENTER();
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
342 xs_subctrl_update();
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
343 GDK_THREADS_LEAVE();
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
344
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
345 /* Check minimum playtime */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
346 songLength = myTune->subTunes[myStatus.currSong-1].tuneLength;
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
347 if (xs_cfg.playMinTimeEnable && songLength >= 0)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
348 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
349 if (songLength < xs_cfg.playMinTime)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
350 songLength = xs_cfg.playMinTime;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
351 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
352
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
353 /* Initialize song */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
354 if (!myStatus.engine->plrInitSong(&myStatus))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
355 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
356 xs_error("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
357 myTune->sidFilename, myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
358 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
359 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
360
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
361 /* Open the audio output */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
362 XSDEBUG("open audio output (%d, %d, %d)\n",
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
363 myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
364
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
365 if (!xs_plugin_ip.output->
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
366 open_audio(myStatus.audioFormat, myStatus.audioFrequency, myStatus.audioChannels))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
367 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
368 xs_error("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n",
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
369 myStatus.audioFormat,
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
370 myStatus.audioFrequency,
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
371 myStatus.audioChannels);
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
372
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
373 XS_MUTEX_LOCK(xs_status);
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
374 xs_status.error = TRUE;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
375 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
376 goto xs_err_exit;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
377 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
378
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
379 audioOpen = TRUE;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
380
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
381 /* Set song information for current subtune */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
382 XSDEBUG("set tune info\n");
753
36c6a6e629bb Rename some variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
383 myStatus.engine->plrUpdateSIDInfo(&myStatus);
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
384 tmpTitle = xs_make_titlestring(myTune, myStatus.currSong);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
385
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
386 xs_plugin_ip.set_info(
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
387 tmpTitle,
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
388 (songLength > 0) ? (songLength * 1000) : 0,
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
389 -1,
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
390 myStatus.audioFrequency,
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
391 myStatus.audioChannels);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
392
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
393 g_free(tmpTitle);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
394
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
395 XSDEBUG("playing\n");
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
396
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
397 /*
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
398 * Play the subtune
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
399 */
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
400 while (xs_status.playing && myStatus.playing && (xs_status.currSong == myStatus.currSong))
767
cf644ac89b54 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 763
diff changeset
401 {
753
36c6a6e629bb Rename some variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
402 audioGot = myStatus.engine->plrFillBuffer(
748
d9d769b5dbe2 Remove oversampling support.
Matti Hamalainen <ccr@tnsp.org>
parents: 735
diff changeset
403 &myStatus, audioBuffer, XS_AUDIOBUF_SIZE);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
404
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
405 /* I <3 visualice/haujobb */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
406 xs_plugin_ip.add_vis_pcm(
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
407 xs_plugin_ip.output->written_time(),
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
408 myStatus.audioFormat, myStatus.audioChannels,
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
409 audioGot, audioBuffer);
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
410
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
411 /* Wait a little */
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
412 while (xs_status.playing &&
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
413 (xs_status.currSong == myStatus.currSong) &&
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
414 (xs_plugin_ip.output->buffer_free() < audioGot))
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
415 xmms_usleep(500);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
416
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
417 /* Output audio */
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
418 if (xs_status.playing && xs_status.currSong == myStatus.currSong)
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
419 xs_plugin_ip.output->write_audio(audioBuffer, audioGot);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
420
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
421 /* Check if we have played enough */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
422 if (xs_cfg.playMaxTimeEnable)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
423 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
424 if (xs_cfg.playMaxTimeUnknown)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
425 {
767
cf644ac89b54 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 763
diff changeset
426 if (songLength < 0 &&
cf644ac89b54 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 763
diff changeset
427 xs_plugin_ip.output->output_time() >= xs_cfg.playMaxTime * 1000)
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
428 myStatus.playing = FALSE;
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
429 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
430 else
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
431 {
767
cf644ac89b54 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 763
diff changeset
432 if (xs_plugin_ip.output->output_time() >= xs_cfg.playMaxTime * 1000)
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
433 myStatus.playing = FALSE;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
434 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
435 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
436
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
437 if (songLength >= 0)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
438 {
767
cf644ac89b54 Cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents: 763
diff changeset
439 if (xs_plugin_ip.output->output_time() >= songLength * 1000)
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
440 myStatus.playing = FALSE;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
441 }
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
442 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
443
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
444 XSDEBUG("subtune ended/stopped\n");
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
445
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
446 /* Close audio output plugin */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
447 if (audioOpen)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
448 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
449 XSDEBUG("close audio #1\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
450 xs_plugin_ip.output->close_audio();
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
451 audioOpen = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
452 XSDEBUG("closed\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
453 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
454
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
455 /* Now determine if we continue by selecting other subtune or something */
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
456 if (!myStatus.playing && !xs_cfg.subAutoEnable)
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
457 doPlay = FALSE;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
458 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
459
402
f997b79a7251 More work on merging of improved STIL/SLDB handling code with completely
Matti Hamalainen <ccr@tnsp.org>
parents: 392
diff changeset
460 xs_err_exit:
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
461 XSDEBUG("out of playing loop\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
462
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
463 /* Close audio output plugin */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
464 if (audioOpen)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
465 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
466 XSDEBUG("close audio #2\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
467 xs_plugin_ip.output->close_audio();
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
468 XSDEBUG("closed\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
469 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
470
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
471 g_free(audioBuffer);
241
291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents: 235
diff changeset
472
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
473 /* Set playing status to false (stopped), thus when
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
474 * XMMS next calls xs_get_time(), it can return appropriate
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
475 * value "not playing" status and XMMS knows to move to
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
476 * next entry in the playlist .. or whatever it wishes.
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
477 */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
478 XS_MUTEX_LOCK(xs_status);
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
479 xs_status.playing = FALSE;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
480 XS_MUTEX_UNLOCK(xs_status);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
481
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
482 /* Exit the playing thread */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
483 XSDEBUG("exiting thread, bye.\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
484 XS_THREAD_EXIT(NULL);
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
485 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
486
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
487
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
488 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
489 * Start playing the given file
202
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
490 * Here we load the tune and initialize the playing thread.
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
491 * Usually you would also initialize the output-plugin, but
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
492 * this is XMMS-SID and we do it on the player thread instead.
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
493 */
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
494 void xs_play_file(gchar *filename)
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
495 {
865
9052d9096c59 Check for NULL filename here.
Matti Hamalainen <ccr@tnsp.org>
parents: 860
diff changeset
496 if (xs_status.engine == NULL || filename == NULL)
760
f6a57c0656fa Handle engine initialization failures a bit more .. "gracefully".
Matti Hamalainen <ccr@tnsp.org>
parents: 753
diff changeset
497 return;
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
498
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
499 XSDEBUG("play '%s'\n", filename);
72
e3b205a6bc7e Lots re-arranging and new code for upcoming modularization.
Matti Hamalainen <ccr@tnsp.org>
parents: 71
diff changeset
500
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
501 /* Get tune information */
753
36c6a6e629bb Rename some variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
502 if ((xs_status.tuneInfo = xs_status.engine->plrGetSIDInfo(filename)) == NULL)
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
503 return;
87
94497283affa Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents: 84
diff changeset
504
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
505 /* Initialize the tune */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
506 if (!xs_status.engine->plrLoadSID(&xs_status, filename))
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
507 {
849
2663b1ac9ce6 Improve debugging.
Matti Hamalainen <ccr@tnsp.org>
parents: 846
diff changeset
508 XSDEBUG("backend could not load '%s'\n", filename);
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
509 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
510 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
511 return;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
512 }
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
513
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
514 XSDEBUG("load ok\n");
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
515
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
516 /* Set general status information */
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
517 xs_status.playing = TRUE;
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
518 xs_status.error = FALSE;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
519 xs_status.currSong = xs_status.tuneInfo->startTune;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
520
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
521 /* Start the playing thread! */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
522 if (pthread_create(&xs_decode_thread, NULL, xs_playthread, NULL) < 0)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
523 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
524 xs_error("Couldn't create playing thread!\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
525 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
526 xs_status.tuneInfo = NULL;
753
36c6a6e629bb Rename some variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
527 xs_status.engine->plrDeleteSID(&xs_status);
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
528 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
529
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
530 /* Okay, here the playing thread has started up and we
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
531 * return from here to XMMS. Rest is up to XMMS's GUI
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
532 * and playing thread.
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
533 */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
534 XSDEBUG("systems should be up?\n");
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
535 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
536
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
537
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
538 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
539 * Stop playing
202
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
540 * Here we set the playing status to stop and wait for playing
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
541 * thread to shut down. In any "correctly" done plugin, this is
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
542 * also the function where you close the output-plugin, but since
264
2316e524d67b Improved comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 253
diff changeset
543 * XMMS-SID has special behaviour (audio opened/closed in the
2316e524d67b Improved comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 253
diff changeset
544 * playing thread), we don't do that here.
202
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
545 *
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
546 * Finally tune and other memory allocations are free'd.
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
547 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
548 void xs_stop(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
549 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
550 XSDEBUG("stop requested\n");
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
551
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
552 /* Close the sub-tune control window, if any */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
553 xs_subctrl_close();
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
554
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
555 /* Lock xs_status and stop playing thread */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
556 XS_MUTEX_LOCK(xs_status);
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
557 if (xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
558 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
559 XSDEBUG("stopping...\n");
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
560 xs_status.playing = FALSE;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
561 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
562 XS_THREAD_JOIN(xs_decode_thread);
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
563 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
564 else
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
565 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
566 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
567 }
75
653c9b0d1320 SIDPlay2 support "works" now. Borked problems with threads.
Matti Hamalainen <ccr@tnsp.org>
parents: 74
diff changeset
568
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
569 XSDEBUG("done, updating status\n");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
570
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
571 /* Status is now stopped, update the sub-tune
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
572 * controller in fileinfo window (if open)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
573 */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
574 xs_fileinfo_update();
241
291715a519e2 Compile-time setting to enable/disable use of dynamically allocated buffers.
Matti Hamalainen <ccr@tnsp.org>
parents: 235
diff changeset
575
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
576 /* Free tune information */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
577 XS_MUTEX_LOCK(xs_status);
794
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
578 if (xs_status.engine != NULL)
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
579 xs_status.engine->plrDeleteSID(&xs_status);
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
580
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
581 xs_tuneinfo_free(xs_status.tuneInfo);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
582 xs_status.tuneInfo = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
583 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
584 XSDEBUG("ok\n");
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
585 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
586
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
587
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
588 /*
87
94497283affa Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents: 84
diff changeset
589 * Pause/unpause the playing
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
590 */
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
591 void xs_pause(short pause)
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
592 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
593 XS_MUTEX_LOCK(xs_status);
799
13483b855058 Fix subsong control window problems during pause state.
Matti Hamalainen <ccr@tnsp.org>
parents: 798
diff changeset
594 xs_status.paused = pause;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
595 XS_MUTEX_UNLOCK(xs_status);
264
2316e524d67b Improved comments.
Matti Hamalainen <ccr@tnsp.org>
parents: 253
diff changeset
596
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
597 xs_subctrl_close();
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
598 xs_fileinfo_update();
688
Matti Hamalainen <ccr@tnsp.org>
parents: 672
diff changeset
599 xs_plugin_ip.output->pause(pause);
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
600 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
601
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
602
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
603 /*
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
604 * Pop-up subtune selector
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
605 */
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
606 void xs_subctrl_setsong(void)
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
607 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
608 gint n;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
609
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
610 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
611 XS_MUTEX_LOCK(xs_subctrl);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
612
799
13483b855058 Fix subsong control window problems during pause state.
Matti Hamalainen <ccr@tnsp.org>
parents: 798
diff changeset
613 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
614 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
615 n = (gint) GTK_ADJUSTMENT(xs_subctrl_adj)->value;
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
616 if (n >= 1 && n <= xs_status.tuneInfo->nsubTunes)
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
617 xs_status.currSong = n;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
618 }
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
619
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
620 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
621 XS_MUTEX_UNLOCK(xs_status);
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
622 }
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
623
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
624
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
625 void xs_subctrl_prevsong(void)
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
626 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
627 XS_MUTEX_LOCK(xs_status);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
628
799
13483b855058 Fix subsong control window problems during pause state.
Matti Hamalainen <ccr@tnsp.org>
parents: 798
diff changeset
629 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
630 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
631 if (xs_status.currSong > 1)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
632 xs_status.currSong--;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
633 }
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
634
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
635 XS_MUTEX_UNLOCK(xs_status);
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
636
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
637 xs_subctrl_update();
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
638 }
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
639
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
640
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
641 void xs_subctrl_nextsong(void)
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
642 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
643 XS_MUTEX_LOCK(xs_status);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
644
799
13483b855058 Fix subsong control window problems during pause state.
Matti Hamalainen <ccr@tnsp.org>
parents: 798
diff changeset
645 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
646 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
647 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
648 xs_status.currSong++;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
649 }
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
650
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
651 XS_MUTEX_UNLOCK(xs_status);
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
652
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
653 xs_subctrl_update();
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
654 }
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
655
177
6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents: 172
diff changeset
656
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
657 void xs_subctrl_update(void)
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
658 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
659 GtkAdjustment *tmpAdj;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
660
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
661 XS_MUTEX_LOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
662 XS_MUTEX_LOCK(xs_subctrl);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
663
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
664 /* Check if control window exists, we are currently playing and have a tune */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
665 if (xs_subctrl)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
666 {
799
13483b855058 Fix subsong control window problems during pause state.
Matti Hamalainen <ccr@tnsp.org>
parents: 798
diff changeset
667 if (!xs_status.paused && xs_status.tuneInfo && xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
668 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
669 tmpAdj = GTK_ADJUSTMENT(xs_subctrl_adj);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
670
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
671 tmpAdj->value = xs_status.currSong;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
672 tmpAdj->lower = 1;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
673 tmpAdj->upper = xs_status.tuneInfo->nsubTunes;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
674 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
675 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
676 gtk_adjustment_value_changed(tmpAdj);
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
677 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
678 else
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
679 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
680 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
681 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
682 xs_subctrl_close();
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
683 }
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
684 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
685 else
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
686 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
687 XS_MUTEX_UNLOCK(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
688 XS_MUTEX_UNLOCK(xs_status);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
689 }
177
6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents: 172
diff changeset
690
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
691 xs_fileinfo_update();
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
692 }
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
693
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
694
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
695 void xs_subctrl_close(void)
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
696 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
697 XS_MUTEX_LOCK(xs_subctrl);
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
698
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
699 if (xs_subctrl)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
700 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
701 gtk_widget_destroy(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
702 xs_subctrl = NULL;
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
703 }
232
e613873c3379 Thread locking now final. All parts, including GTK GUI, should be(?)
Matti Hamalainen <ccr@tnsp.org>
parents: 230
diff changeset
704
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
705 XS_MUTEX_UNLOCK(xs_subctrl);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
706 }
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
707
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
708
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
709 gboolean xs_subctrl_keypress(GtkWidget * win, GdkEventKey * ev)
184
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
710 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
711 (void) win;
184
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
712
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
713 if (ev->keyval == GDK_Escape)
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
714 xs_subctrl_close();
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
715
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
716 return FALSE;
184
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
717 }
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
718
4406e91d2da3 Subtune control slider in fileinfo-window now works. Various fixes.
Matti Hamalainen <ccr@tnsp.org>
parents: 177
diff changeset
719
294
f0ece2d20094 Do correct typecasts and declare xs_subctrl_open arguments as void.
Matti Hamalainen <ccr@tnsp.org>
parents: 281
diff changeset
720 void xs_subctrl_open(void)
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
721 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
722 GtkWidget *frame25, *hbox15, *subctrl_prev, *subctrl_current, *subctrl_next;
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
723
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
724 XS_MUTEX_LOCK(xs_subctrl);
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
725
860
852fe7009876 Prevent subsong control from opening when paused.
Matti Hamalainen <ccr@tnsp.org>
parents: 849
diff changeset
726 if (xs_status.paused || !xs_status.tuneInfo || !xs_status.playing ||
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
727 xs_subctrl || xs_status.tuneInfo->nsubTunes <= 1)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
728 goto out;
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
729
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
730 /* Create the pop-up window */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
731 xs_subctrl = gtk_window_new(GTK_WINDOW_DIALOG);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
732 gtk_widget_set_name(xs_subctrl, "xs_subctrl");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
733 gtk_object_set_data(GTK_OBJECT(xs_subctrl), "xs_subctrl", xs_subctrl);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
734
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
735 gtk_window_set_title(GTK_WINDOW(xs_subctrl), _("Subtune Control"));
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
736 gtk_window_set_position(GTK_WINDOW(xs_subctrl), GTK_WIN_POS_MOUSE);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
737 gtk_container_set_border_width(GTK_CONTAINER(xs_subctrl), 0);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
738 gtk_window_set_policy(GTK_WINDOW(xs_subctrl), FALSE, FALSE, FALSE);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
739
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
740 XS_SIGNAL_CONNECT(xs_subctrl, "destroy", gtk_widget_destroyed, &xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
741 XS_SIGNAL_CONNECT(xs_subctrl, "focus_out_event", xs_subctrl_close, NULL);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
742
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
743 gtk_widget_realize(xs_subctrl);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
744 gdk_window_set_decorations(xs_subctrl->window, (GdkWMDecoration) 0);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
745
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
746
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
747 /* Create the control widgets */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
748 frame25 = gtk_frame_new(NULL);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
749 gtk_container_add(GTK_CONTAINER(xs_subctrl), frame25);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
750 gtk_container_set_border_width(GTK_CONTAINER(frame25), 2);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
751 gtk_frame_set_shadow_type(GTK_FRAME(frame25), GTK_SHADOW_OUT);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
752
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
753 hbox15 = gtk_hbox_new(FALSE, 4);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
754 gtk_container_add(GTK_CONTAINER(frame25), hbox15);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
755
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
756 subctrl_prev = gtk_button_new_with_label(" < ");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
757 gtk_widget_set_name(subctrl_prev, "subctrl_prev");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
758 gtk_box_pack_start(GTK_BOX(hbox15), subctrl_prev, FALSE, FALSE, 0);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
759
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
760 xs_subctrl_adj = gtk_adjustment_new(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes, 1, 1, 0);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
761 XS_SIGNAL_CONNECT(xs_subctrl_adj, "value_changed", xs_subctrl_setsong, NULL);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
762
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
763 subctrl_current = gtk_hscale_new(GTK_ADJUSTMENT(xs_subctrl_adj));
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
764 gtk_widget_set_name(subctrl_current, "subctrl_current");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
765 gtk_box_pack_start(GTK_BOX(hbox15), subctrl_current, FALSE, TRUE, 0);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
766 gtk_scale_set_digits(GTK_SCALE(subctrl_current), 0);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
767 gtk_range_set_update_policy(GTK_RANGE(subctrl_current), GTK_UPDATE_DELAYED);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
768 gtk_widget_grab_focus(subctrl_current);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
769
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
770 subctrl_next = gtk_button_new_with_label(" > ");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
771 gtk_widget_set_name(subctrl_next, "subctrl_next");
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
772 gtk_box_pack_start(GTK_BOX(hbox15), subctrl_next, FALSE, FALSE, 0);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
773
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
774 XS_SIGNAL_CONNECT(subctrl_prev, "clicked", xs_subctrl_prevsong, NULL);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
775 XS_SIGNAL_CONNECT(subctrl_next, "clicked", xs_subctrl_nextsong, NULL);
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
776 XS_SIGNAL_CONNECT(xs_subctrl, "key_press_event", xs_subctrl_keypress, NULL);
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
777
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
778 gtk_widget_show_all(xs_subctrl);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
779
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
780 out:
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
781 XS_MUTEX_UNLOCK(xs_subctrl);
140
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
782 }
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
783
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
784
8b9c14540e53 - Added UADE-style popup subsong-selector
Matti Hamalainen <ccr@tnsp.org>
parents: 138
diff changeset
785 /*
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
786 * Set the time-seek position
202
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
787 * The playing thread will do the "seeking", which means sub-tune
672
f22a708d29fd Remove some camelcasing / hungarian notation.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
788 * changing in XMMS-SID's case. time argument is time in seconds,
202
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
789 * in contrast to milliseconds used in other occasions.
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
790 *
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
791 * This function is called whenever position slider is clicked or
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
792 * other method of seeking is used (keyboard, etc.)
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
793 */
672
f22a708d29fd Remove some camelcasing / hungarian notation.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
794 void xs_seek(gint time)
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
795 {
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
796 XS_MUTEX_LOCK(xs_status);
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
797 if (!xs_status.tuneInfo || !xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
798 goto out;
132
4162a5370b9e Added "seek"-subsong control option, in style of xmms-sidplay.
Matti Hamalainen <ccr@tnsp.org>
parents: 127
diff changeset
799
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
800 switch (xs_cfg.subsongControl)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
801 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
802 case XS_SSC_SEEK:
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
803 if (time < xs_status.lastTime)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
804 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
805 if (xs_status.currSong > 1)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
806 xs_status.currSong--;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
807 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
808 else
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
809 if (time > xs_status.lastTime)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
810 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
811 if (xs_status.currSong < xs_status.tuneInfo->nsubTunes)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
812 xs_status.currSong++;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
813 }
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
814 break;
78
ab522ab65c85 Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents: 75
diff changeset
815
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
816 case XS_SSC_POPUP:
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
817 xs_subctrl_open();
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
818 break;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
819
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
820 /* If we have song-position patch, check settings */
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
821 #ifdef HAVE_SONG_POSITION
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
822 case XS_SSC_PATCH:
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
823 if (time > 0 && time <= xs_status.tuneInfo->nsubTunes)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
824 xs_status.currSong = time;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
825 break;
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
826 #endif
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
827 }
103
fe83646e6baa Changed plrFillBuffer()-functions to return actual number of samples computed.
Matti Hamalainen <ccr@tnsp.org>
parents: 99
diff changeset
828
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
829 out:
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
830 XS_MUTEX_UNLOCK(xs_status);
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
831 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
832
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
833
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
834 /*
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
835 * Return the playing "position/time"
202
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
836 * Determine current position/time in song. Used by XMMS to update
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
837 * the song clock and position slider and MOST importantly to determine
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
838 * END OF SONG! Return value of -2 means error, XMMS opens an audio
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
839 * error dialog. -1 means end of song (if one was playing currently).
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
840 */
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
841 gint xs_get_time(void)
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
842 {
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
843 int err;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
844
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
845 /* If errorflag is set, return -2 to signal it to XMMS's idle callback */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
846 XS_MUTEX_LOCK(xs_status);
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
847 if (xs_status.error)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
848 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
849 err = -2;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
850 goto error;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
851 }
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
852
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
853 /* If there is no tune or tune has ended, return -1 */
798
4c5b695fd85e Rename variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 797
diff changeset
854 if (!xs_status.tuneInfo || !xs_status.playing)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
855 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
856 err = -1;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
857 goto error;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
858 }
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
859
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
860 /* Let's see what we do */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
861 switch (xs_cfg.subsongControl)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
862 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
863 case XS_SSC_SEEK:
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
864 xs_status.lastTime = (xs_plugin_ip.output->output_time() / 1000);
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
865 break;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
866
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
867 #ifdef HAVE_SONG_POSITION
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
868 case XS_SSC_PATCH:
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
869 set_song_position(xs_status.currSong, 1, xs_status.tuneInfo->nsubTunes);
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
870 break;
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
871 #endif
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
872 }
230
608f31f6c095 Raw cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 225
diff changeset
873
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
874 XS_MUTEX_UNLOCK(xs_status);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
875
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
876 /* Return output time reported by audio output plugin */
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
877 return xs_plugin_ip.output->output_time();
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
878
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
879 error:
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
880 XS_MUTEX_UNLOCK(xs_status);
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
881 return err;
71
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
882 }
2b32c75729ce Started modularizing, separated sidplay1 things into a "wrapper" module.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff changeset
883
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
884
477
53bdac2e0dcb Moved sldb glue functions here; Cosmetic cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents: 472
diff changeset
885 /* Return song information: called by XMMS when initially loading the playlist.
202
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
886 * Subsequent changes to information are made by the player thread,
fe684a2ccdc7 Reworking code.
Matti Hamalainen <ccr@tnsp.org>
parents: 200
diff changeset
887 * which uses xs_plugin_ip.set_info();
73
2bc607888f53 Added libsidplay2 module, lots of reworking of internals, sidplay1 support
Matti Hamalainen <ccr@tnsp.org>
parents: 72
diff changeset
888 */
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
889 void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)
87
94497283affa Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents: 84
diff changeset
890 {
751
55eea3fa8868 Rename some structures.
Matti Hamalainen <ccr@tnsp.org>
parents: 748
diff changeset
891 XSTuneInfo *info;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
892
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
893 XS_MUTEX_LOCK(xs_status);
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
894
794
3012740d014c Add some NULL pointer checks in case the emulator engine backend didn't
Matti Hamalainen <ccr@tnsp.org>
parents: 787
diff changeset
895 if (xs_status.engine == NULL)
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
896 goto out;
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
897
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
898 /* Get tune information from emulation engine */
753
36c6a6e629bb Rename some variables.
Matti Hamalainen <ccr@tnsp.org>
parents: 751
diff changeset
899 info = xs_status.engine->plrGetSIDInfo(songFilename);
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
900 if (!info)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
901 goto out;
87
94497283affa Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents: 84
diff changeset
902
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
903 /* Get sub-tune information, if available */
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
904 if (info->startTune > 0 && info->startTune <= info->nsubTunes)
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
905 {
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
906 gint length;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
907
672
f22a708d29fd Remove some camelcasing / hungarian notation.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
908 (*songTitle) = xs_make_titlestring(info, info->startTune);
359
b1a858b8cb1a Re-indentation all (non-generated) code.
Matti Hamalainen <ccr@tnsp.org>
parents: 354
diff changeset
909
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
910 length = info->subTunes[info->startTune-1].tuneLength;
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
911 (*songLength) = length < 0 ? -1 : length * 1000;
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
912 }
177
6e350784aa57 Various cleanups. Min-playtime option now works. Configuration has more
Matti Hamalainen <ccr@tnsp.org>
parents: 172
diff changeset
913
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
914 /* Free tune information */
672
f22a708d29fd Remove some camelcasing / hungarian notation.
Matti Hamalainen <ccr@tnsp.org>
parents: 660
diff changeset
915 xs_tuneinfo_free(info);
797
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
916
02512cbc6d9f Cleanup, mostly cosmetic.
Matti Hamalainen <ccr@tnsp.org>
parents: 794
diff changeset
917 out:
660
b0743dc9165d Change tabs to 4 spaces, everywhere.
Matti Hamalainen <ccr@tnsp.org>
parents: 659
diff changeset
918 XS_MUTEX_UNLOCK(xs_status);
87
94497283affa Various fixes and improvements
Matti Hamalainen <ccr@tnsp.org>
parents: 84
diff changeset
919 }