annotate src/sid/xmms-sid.c @ 1668:4c088a45f839

More code cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 08 Sep 2007 04:22:31 +0300
parents 6e187f6abd4d
children aee4ebea943a 62e89e392227
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
1 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
2 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
3
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
4 Main source file
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
5
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
6 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
7 (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
8
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
9 This program is free software; you can redistribute it and/or modify
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
10 it under the terms of the GNU General Public License as published by
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
11 the Free Software Foundation; either version 2 of the License, or
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
12 (at your option) any later version.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
13
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
14 This program is distributed in the hope that it will be useful,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
17 GNU General Public License for more details.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
18
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
19 You should have received a copy of the GNU General Public License along along
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
20 with this program; if not, write to the Free Software Foundation, Inc.,
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
21 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
22 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
23 #include "xmms-sid.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
24
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
25 #ifdef HAVE_STDLIB_H
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
26 #include <stdlib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
27 #endif
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
28
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
29 #include <stdarg.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
30 #include <gdk/gdkkeysyms.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
31
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
32 #include "xs_config.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
33 #include "xs_length.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
34 #include "xs_stil.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
35 #include "xs_filter.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
36 #include "xs_fileinfo.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
37 #include "xs_interface.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
38 #include "xs_glade.h"
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
39 #include "xs_player.h"
1574
e566e18e9e3d Huge cleanup and some bugfixes. Temporarily breaks / removes sub-tune
Matti Hamalainen <ccr@tnsp.org>
parents: 1564
diff changeset
40 #include "xs_slsup.h"
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
41 #include "audacious/playlist.h"
1574
e566e18e9e3d Huge cleanup and some bugfixes. Temporarily breaks / removes sub-tune
Matti Hamalainen <ccr@tnsp.org>
parents: 1564
diff changeset
42
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
43
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
44 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
45 * Include player engines
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
46 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
47 #ifdef HAVE_SIDPLAY1
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
48 #include "xs_sidplay1.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
49 #endif
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
50 #ifdef HAVE_SIDPLAY2
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
51 #include "xs_sidplay2.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
52 #endif
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
53
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
54
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
55 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
56 * List of players and links to their functions
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
57 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
58 t_xs_player xs_playerlist[] = {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
59 #ifdef HAVE_SIDPLAY1
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
60 {XS_ENG_SIDPLAY1,
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
61 xs_sidplay1_probe,
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
62 xs_sidplay1_init, xs_sidplay1_close,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
63 xs_sidplay1_initsong, xs_sidplay1_fillbuffer,
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
64 xs_sidplay1_load, xs_sidplay1_delete,
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
65 xs_sidplay1_getinfo, xs_sidplay1_updateinfo,
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
66 NULL
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
67 },
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
68 #endif
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
69 #ifdef HAVE_SIDPLAY2
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
70 {XS_ENG_SIDPLAY2,
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
71 xs_sidplay2_probe,
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
72 xs_sidplay2_init, xs_sidplay2_close,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
73 xs_sidplay2_initsong, xs_sidplay2_fillbuffer,
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
74 xs_sidplay2_load, xs_sidplay2_delete,
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
75 xs_sidplay2_getinfo, xs_sidplay2_updateinfo,
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
76 xs_sidplay2_flush
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
77 },
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
78 #endif
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
79 };
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
80
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
81 const gint xs_nplayerlist = (sizeof(xs_playerlist) / sizeof(t_xs_player));
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
82
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
83
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
84 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
85 * Global variables
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
86 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
87 t_xs_status xs_status;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
88 XS_MUTEX(xs_status);
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
89 static XS_THREAD_T xs_decode_thread;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
90
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
91 void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
92
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
93 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
94 * Error messages
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
95 */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
96 void xs_error(const char *fmt, ...)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
97 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
98 va_list ap;
1574
e566e18e9e3d Huge cleanup and some bugfixes. Temporarily breaks / removes sub-tune
Matti Hamalainen <ccr@tnsp.org>
parents: 1564
diff changeset
99 fprintf(stderr, "AUD-SID: ");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
100 va_start(ap, fmt);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
101 vfprintf(stderr, fmt, ap);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
102 va_end(ap);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
103 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
104
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
105 #ifndef DEBUG_NP
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
106 void XSDEBUG(const char *fmt, ...)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
107 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
108 #ifdef DEBUG
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
109 va_list ap;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
110 fprintf(stderr, "XSDEBUG: ");
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
111 va_start(ap, fmt);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
112 vfprintf(stderr, fmt, ap);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
113 va_end(ap);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
114 #endif
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
115 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
116 #endif
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
117
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
118
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
119 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
120 * Initialization functions
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
121 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
122 void xs_reinit(void)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
123 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
124 gint iPlayer;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
125 gboolean isInitialized;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
126
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
127 XSDEBUG("xs_reinit() thread = %p\n", g_thread_self());
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
128
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
129 /* Stop playing, if we are */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
130 XS_MUTEX_LOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
131 if (xs_status.isPlaying) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
132 XS_MUTEX_UNLOCK(xs_status);
563
ccf952b07c77 [svn] Fix sid for current API.
iabervon
parents: 561
diff changeset
133 xs_stop(NULL);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
134 } else {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
135 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
136 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
137
1554
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
138 XS_MUTEX_LOCK(xs_status);
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
139 XS_MUTEX_LOCK(xs_cfg);
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
140
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
141 /* Initialize status and sanitize configuration */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
142 xs_memset(&xs_status, 0, sizeof(xs_status));
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
143
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
144 if (xs_cfg.audioFrequency < 8000)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
145 xs_cfg.audioFrequency = 8000;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
146
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
147 if (xs_cfg.oversampleFactor < XS_MIN_OVERSAMPLE)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
148 xs_cfg.oversampleFactor = XS_MIN_OVERSAMPLE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
149 else if (xs_cfg.oversampleFactor > XS_MAX_OVERSAMPLE)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
150 xs_cfg.oversampleFactor = XS_MAX_OVERSAMPLE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
151
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
152 if (xs_cfg.audioChannels != XS_CHN_MONO)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
153 xs_cfg.oversampleEnable = FALSE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
154
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
155 xs_status.audioFrequency = xs_cfg.audioFrequency;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
156 xs_status.audioBitsPerSample = xs_cfg.audioBitsPerSample;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
157 xs_status.audioChannels = xs_cfg.audioChannels;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
158 xs_status.audioFormat = -1;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
159 xs_status.oversampleEnable = xs_cfg.oversampleEnable;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
160 xs_status.oversampleFactor = xs_cfg.oversampleFactor;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
161
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
162 /* Try to initialize emulator engine */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
163 XSDEBUG("initializing emulator engine #%i...\n", xs_cfg.playerEngine);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
164
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
165 iPlayer = 0;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
166 isInitialized = FALSE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
167 while ((iPlayer < xs_nplayerlist) && !isInitialized) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
168 if (xs_playerlist[iPlayer].plrIdent == xs_cfg.playerEngine) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
169 if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
170 isInitialized = TRUE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
171 xs_status.sidPlayer = (t_xs_player *) & xs_playerlist[iPlayer];
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
172 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
173 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
174 iPlayer++;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
175 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
176
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
177 XSDEBUG("init#1: %s, %i\n", (isInitialized) ? "OK" : "FAILED", iPlayer);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
178
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
179 iPlayer = 0;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
180 while ((iPlayer < xs_nplayerlist) && !isInitialized) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
181 if (xs_playerlist[iPlayer].plrInit(&xs_status)) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
182 isInitialized = TRUE;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
183 xs_status.sidPlayer = (t_xs_player *) & xs_playerlist[iPlayer];
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
184 xs_cfg.playerEngine = xs_playerlist[iPlayer].plrIdent;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
185 } else
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
186 iPlayer++;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
187 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
188
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
189 XSDEBUG("init#2: %s, %i\n", (isInitialized) ? "OK" : "FAILED", iPlayer);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
190
1554
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
191
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
192 /* Get settings back, in case the chosen emulator backend changed them */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
193 xs_cfg.audioFrequency = xs_status.audioFrequency;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
194 xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
195 xs_cfg.audioChannels = xs_status.audioChannels;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
196 xs_cfg.oversampleEnable = xs_status.oversampleEnable;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
197
1554
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
198 XS_MUTEX_UNLOCK(xs_status);
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
199 XS_MUTEX_UNLOCK(xs_cfg);
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
200
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
201 /* Initialize song-length database */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
202 xs_songlen_close();
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
203 if (xs_cfg.songlenDBEnable && (xs_songlen_init() != 0)) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
204 xs_error(_("Error initializing song-length database!\n"));
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
205 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
206
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
207 /* Initialize STIL database */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
208 xs_stil_close();
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
209 if (xs_cfg.stilDBEnable && (xs_stil_init() != 0)) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
210 xs_error(_("Error initializing STIL database!\n"));
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
211 }
1554
f7c630358bda Merge thread locking/mutex fix from XMMS-SID. Fixes a race between
Matti Hamalainen <ccr@tnsp.org>
parents: 1516
diff changeset
212
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
213 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
214
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
215
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
216 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
217 * Initialize XMMS-SID
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
218 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
219 void xs_init(void)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
220 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
221 XSDEBUG("xs_init()\n");
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
222
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
223 /* Initialize and get configuration */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
224 xs_init_configuration();
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
225 xs_read_configuration();
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
226
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
227 /* Initialize subsystems */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
228 xs_reinit();
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
229
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
230 XSDEBUG("OK\n");
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
231 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
232
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
233
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
234 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
235 * Shut down XMMS-SID
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
236 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
237 void xs_close(void)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
238 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
239 XSDEBUG("xs_close(): shutting down...\n");
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
240
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
241 /* Stop playing, free structures */
563
ccf952b07c77 [svn] Fix sid for current API.
iabervon
parents: 561
diff changeset
242 xs_stop(NULL);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
243
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
244 xs_tuneinfo_free(xs_status.tuneInfo);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
245 xs_status.tuneInfo = NULL;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
246 xs_status.sidPlayer->plrDeleteSID(&xs_status);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
247 xs_status.sidPlayer->plrClose(&xs_status);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
248
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
249 xs_songlen_close();
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
250 xs_stil_close();
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
251
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
252 XSDEBUG("shutdown finished.\n");
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
253 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
254
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
255
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
256 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
257 * Check whether the given file is handled by this plugin
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
258 */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
259 gint xs_is_our_file(gchar *pcFilename)
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
260 {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
261 gint result = 0;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
262 t_xs_file *f;
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
263 assert(xs_status.sidPlayer);
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
264
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
265 /* Check the filename */
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
266 if (pcFilename == NULL)
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
267 return 0;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
268
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
269 if ((f = xs_fopen(pcFilename, "rb")) != NULL) {
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
270 if (xs_status.sidPlayer->plrProbe(f))
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
271 result = 1;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
272 xs_fclose(f);
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
273 }
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
274
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
275 return result;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
276 }
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
277
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
278 static gchar * xs_has_tracknumber(gchar *pcFilename)
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
279 {
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
280 gchar *tmpSep = xs_strrchr(pcFilename, '?');
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
281 if (tmpSep && g_ascii_isdigit(*(tmpSep + 1)))
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
282 return tmpSep;
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
283 else
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
284 return NULL;
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
285 }
1581
8581eb9d574a Fix fileinfo dialog to work with new subtune system.
Matti Hamalainen <ccr@tnsp.org>
parents: 1579
diff changeset
286
8581eb9d574a Fix fileinfo dialog to work with new subtune system.
Matti Hamalainen <ccr@tnsp.org>
parents: 1579
diff changeset
287 gboolean xs_get_trackinfo(const gchar *pcFilename, gchar **pcResult, gint *pTrack)
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
288 {
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
289 gchar *tmpSep;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
290
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
291 *pcResult = g_strdup(pcFilename);
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
292 tmpSep = xs_has_tracknumber(*pcResult);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
293
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
294 if (tmpSep) {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
295 *tmpSep = '\0';
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
296 *pTrack = atoi(tmpSep + 1);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
297 return TRUE;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
298 } else {
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
299 *pTrack = -1;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
300 return FALSE;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
301 }
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
302 }
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
303
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
304
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
305 gint xs_is_our_file_vfs(gchar *pcFilename, t_xs_file *f)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
306 {
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
307 gint tmpResult = 0, tmpDummy = 0;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
308 assert(xs_status.sidPlayer);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
309
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
310 /* Check the filename */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
311 if (pcFilename == NULL)
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
312 return 0;
1662
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
313
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
314 #ifdef LULZ
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
315 /* FIXME! ATTENTION! Subtune addition is now temporarily disabled
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
316 * again, due to following reason: the way it currently is "supposed"
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
317 * to be done is horribly broken and causes an "infinite recursive
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
318 * addition loop" in some cases. - ccr
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
319 */
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
320 if (xs_has_tracknumber(pcFilename) != NULL)
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
321 return 1;
1662
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
322 #endif
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
323
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
324 if (xs_status.sidPlayer->plrProbe(f)) {
1662
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
325 #ifdef LULZ
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
326 t_xs_tuneinfo *pInfo;
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
327
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
328 pInfo = xs_status.sidPlayer->plrGetSIDInfo(pcFilename);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
329
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
330 if (pInfo->nsubTunes > 1) {
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
331 gint i;
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
332 for (i = 1; i <= pInfo->nsubTunes; i++) {
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
333 gchar *tmpStr = g_strdup_printf("%s?%d", pcFilename, i);
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
334 gboolean doAdd = FALSE;
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
335
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
336 if (xs_cfg.subAutoMinOnly) {
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
337 if (i == pInfo->startTune ||
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
338 pInfo->subTunes[i - 1].tuneLength >= xs_cfg.subAutoMinTime)
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
339 doAdd = TRUE;
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
340 } else
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
341 doAdd = TRUE;
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
342
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
343 if (doAdd)
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
344 playlist_add_url(playlist_get_active(), tmpStr);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
345
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
346 g_free(tmpStr);
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
347 }
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
348
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
349 tmpResult = -1;
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
350 } else
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
351 tmpResult = 1;
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
352
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
353 xs_tuneinfo_free(pInfo);
1662
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
354 #else
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
355 tmpResult = 1;
6e187f6abd4d Disable subtunes support, because the way it is currently "supposed" to be
Matti Hamalainen <ccr@tnsp.org>
parents: 1608
diff changeset
356 #endif
1608
e423bdc4b4d5 Simplify xs_is_our_file_vfs().
Matti Hamalainen <ccr@tnsp.org>
parents: 1605
diff changeset
357 }
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
358
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
359 return tmpResult;
463
1e5cb7a00cb0 [svn] - added is_our_file_from_vfs function to sid, for both libsidplay v1 and v2
giacomo
parents: 462
diff changeset
360 }
1e5cb7a00cb0 [svn] - added is_our_file_from_vfs function to sid, for both libsidplay v1 and v2
giacomo
parents: 462
diff changeset
361
1e5cb7a00cb0 [svn] - added is_our_file_from_vfs function to sid, for both libsidplay v1 and v2
giacomo
parents: 462
diff changeset
362
1e5cb7a00cb0 [svn] - added is_our_file_from_vfs function to sid, for both libsidplay v1 and v2
giacomo
parents: 462
diff changeset
363 /*
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
364 * Start playing the given file
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
365 */
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
366 void xs_play_file(InputPlayback *pb)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
367 {
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
368 t_xs_tuneinfo *tmpTune;
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
369 gboolean audioOpen = FALSE;
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
370 gint audioGot, tmpLength, i, subTune;
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
371 gchar *tmpFilename, *audioBuffer = NULL, *oversampleBuffer = NULL, *tmpTitle;
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
372 Tuple *tmpTuple;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
373
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
374 assert(pb);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
375 assert(xs_status.sidPlayer);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
376
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
377 XSDEBUG("play '%s'\n", pb->filename);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
378
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
379 XS_MUTEX_LOCK(xs_status);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
380
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
381 /* Get tune information */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
382 xs_get_trackinfo(pb->filename, &tmpFilename, &subTune);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
383 if ((xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename)) == NULL) {
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
384 XS_MUTEX_UNLOCK(xs_status);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
385 g_free(tmpFilename);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
386 return;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
387 }
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
388
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
389 /* Initialize the tune */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
390 if (!xs_status.sidPlayer->plrLoadSID(&xs_status, tmpFilename)) {
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
391 XS_MUTEX_UNLOCK(xs_status);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
392 g_free(tmpFilename);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
393 xs_tuneinfo_free(xs_status.tuneInfo);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
394 xs_status.tuneInfo = NULL;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
395 return;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
396 }
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
397
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
398 g_free(tmpFilename);
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
399 tmpFilename = NULL;
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
400
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
401 XSDEBUG("load ok\n");
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
402
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
403 /* Set general status information */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
404 xs_status.isPlaying = TRUE;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
405 xs_status.isError = FALSE;
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
406 tmpTune = xs_status.tuneInfo;
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
407
1582
89fb1700313a Oops, && should've been ||, fixed.
Matti Hamalainen <ccr@tnsp.org>
parents: 1581
diff changeset
408 if (subTune < 1 || subTune > xs_status.tuneInfo->nsubTunes)
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
409 xs_status.currSong = xs_status.tuneInfo->startTune;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
410 else
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
411 xs_status.currSong = subTune;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
412
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
413 XSDEBUG("subtune #%i selected (#%d wanted), initializing...\n", xs_status.currSong, subTune);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
414
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
415
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
416 /* We are ready */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
417 xs_decode_thread = g_thread_self();
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
418 XSDEBUG("playing thread = %p\n", xs_decode_thread);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
419 pb->set_pb_ready(pb);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
420
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
421
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
422 /* Allocate audio buffer */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
423 audioBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
424 if (audioBuffer == NULL) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
425 xs_error(_("Couldn't allocate memory for audio data buffer!\n"));
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
426 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
427 goto xs_err_exit;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
428 }
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
429
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
430 if (xs_status.oversampleEnable) {
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
431 oversampleBuffer = (gchar *) g_malloc(XS_AUDIOBUF_SIZE * xs_status.oversampleFactor);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
432 if (oversampleBuffer == NULL) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
433 xs_error(_("Couldn't allocate memory for audio oversampling buffer!\n"));
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
434 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
435 goto xs_err_exit;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
436 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
437 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
438
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
439
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
440 /* Check minimum playtime */
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
441 tmpLength = tmpTune->subTunes[xs_status.currSong - 1].tuneLength;
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
442 if (xs_cfg.playMinTimeEnable && (tmpLength >= 0)) {
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
443 if (tmpLength < xs_cfg.playMinTime)
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
444 tmpLength = xs_cfg.playMinTime;
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
445 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
446
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
447 /* Initialize song */
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
448 if (!xs_status.sidPlayer->plrInitSong(&xs_status)) {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
449 xs_error(_("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n"),
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
450 tmpTune->sidFilename, xs_status.currSong);
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
451 XS_MUTEX_UNLOCK(xs_status);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
452 goto xs_err_exit;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
453 }
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
454
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
455 /* Open the audio output */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
456 XSDEBUG("open audio output (%d, %d, %d)\n",
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
457 xs_status.audioFormat, xs_status.audioFrequency, xs_status.audioChannels);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
458
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
459 if (!pb->output->open_audio(xs_status.audioFormat, xs_status.audioFrequency, xs_status.audioChannels)) {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
460 xs_error(_("Couldn't open XMMS audio output (fmt=%x, freq=%i, nchan=%i)!\n"),
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
461 xs_status.audioFormat,
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
462 xs_status.audioFrequency,
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
463 xs_status.audioChannels);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
464
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
465 xs_status.isError = TRUE;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
466 XS_MUTEX_UNLOCK(xs_status);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
467 goto xs_err_exit;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
468 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
469
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
470 audioOpen = TRUE;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
471
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
472 /* Set song information for current subtune */
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
473 XSDEBUG("foobar #1\n");
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
474 xs_status.sidPlayer->plrUpdateSIDInfo(&xs_status);
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
475 XS_MUTEX_UNLOCK(xs_status);
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
476 tmpTuple = tuple_new_from_filename(tmpTune->sidFilename);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
477 xs_get_song_tuple_info(tmpTuple, tmpTune, xs_status.currSong);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
478
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
479 tmpTitle = tuple_formatter_process_string(tmpTuple,
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
480 xs_cfg.titleOverride ? xs_cfg.titleFormat : get_gentitle_format());
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
481
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
482 XSDEBUG("foobar #4\n");
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
483 XS_MUTEX_LOCK(xs_status);
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
484 xs_plugin_ip.set_info(
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
485 tmpTitle,
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
486 (tmpLength > 0) ? (tmpLength * 1000) : 0,
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
487 -1,
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
488 xs_status.audioFrequency,
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
489 xs_status.audioChannels);
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
490
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
491 g_free(tmpTitle);
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
492
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
493 XS_MUTEX_UNLOCK(xs_status);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
494 XSDEBUG("playing\n");
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
495 while (xs_status.isPlaying) {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
496 /* Render audio data */
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
497 XS_MUTEX_LOCK(xs_status);
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
498 if (xs_status.oversampleEnable) {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
499 /* Perform oversampled rendering */
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
500 audioGot = xs_status.sidPlayer->plrFillBuffer(
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
501 &xs_status,
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
502 oversampleBuffer,
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
503 (XS_AUDIOBUF_SIZE * xs_status.oversampleFactor));
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
504
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
505 audioGot /= xs_status.oversampleFactor;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
506
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
507 /* Execute rate-conversion with filtering */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
508 if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
509 xs_status.audioFormat, xs_status.oversampleFactor, audioGot) < 0) {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
510 xs_error(_("Oversampling rate-conversion pass failed.\n"));
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
511 xs_status.isError = TRUE;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
512 XS_MUTEX_UNLOCK(xs_status);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
513 goto xs_err_exit;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
514 }
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
515 } else {
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
516 audioGot = xs_status.sidPlayer->plrFillBuffer(
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
517 &xs_status, audioBuffer, XS_AUDIOBUF_SIZE);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
518 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
519
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
520 /* I <3 visualice/haujobb */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
521 produce_audio(pb->output->written_time(),
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
522 xs_status.audioFormat, xs_status.audioChannels,
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
523 audioGot, audioBuffer, NULL);
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
524
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
525 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
526
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
527 /* Wait a little */
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
528 while (xs_status.isPlaying && (pb->output->buffer_free() < audioGot))
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
529 xmms_usleep(500);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
530
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
531 /* Check if we have played enough */
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
532 XS_MUTEX_LOCK(xs_status);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
533 if (xs_cfg.playMaxTimeEnable) {
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
534 if (xs_cfg.playMaxTimeUnknown) {
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
535 if ((tmpLength < 0) &&
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
536 (pb->output->output_time() >= (xs_cfg.playMaxTime * 1000)))
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
537 xs_status.isPlaying = FALSE;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
538 } else {
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
539 if (pb->output->output_time() >= (xs_cfg.playMaxTime * 1000))
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
540 xs_status.isPlaying = FALSE;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
541 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
542 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
543
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
544 if (tmpLength >= 0) {
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
545 if (pb->output->output_time() >= (tmpLength * 1000))
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
546 xs_status.isPlaying = FALSE;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
547 }
1593
f2f0ea5b5876 Cleaned up the mutex locking of xs_play_file(). This seems to magically fix
Matti Hamalainen <ccr@tnsp.org>
parents: 1589
diff changeset
548 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
549 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
550
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
551 xs_err_exit:
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
552 XSDEBUG("out of playing loop\n");
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
553
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
554 /* Close audio output plugin */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
555 if (audioOpen) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
556 XSDEBUG("close audio #2\n");
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
557 pb->output->close_audio();
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
558 XSDEBUG("closed\n");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
559 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
560
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
561 g_free(audioBuffer);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
562 g_free(oversampleBuffer);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
563
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
564 /* Set playing status to false (stopped), thus when
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
565 * XMMS next calls xs_get_time(), it can return appropriate
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
566 * value "not playing" status and XMMS knows to move to
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
567 * next entry in the playlist .. or whatever it wishes.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
568 */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
569 XS_MUTEX_LOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
570 xs_status.isPlaying = FALSE;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
571 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
572
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
573 /* Exit the playing thread */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
574 XSDEBUG("exiting thread, bye.\n");
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
575 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
576
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
577
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
578 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
579 * Stop playing
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
580 * Here we set the playing status to stop and wait for playing
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
581 * thread to shut down. In any "correctly" done plugin, this is
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
582 * also the function where you close the output-plugin, but since
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
583 * XMMS-SID has special behaviour (audio opened/closed in the
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
584 * playing thread), we don't do that here.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
585 *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
586 * Finally tune and other memory allocations are free'd.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
587 */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
588 void xs_stop(InputPlayback *pb)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
589 {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
590 (void) pb;
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
591
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
592 XSDEBUG("stop requested\n");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
593
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
594 /* Lock xs_status and stop playing thread */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
595 XS_MUTEX_LOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
596 if (xs_status.isPlaying) {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
597 XSDEBUG("stopping...\n");
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
598 xs_status.isPlaying = FALSE;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
599 XS_MUTEX_UNLOCK(xs_status);
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
600 XS_THREAD_JOIN(xs_decode_thread);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
601 } else {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
602 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
603 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
604
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
605 XSDEBUG("done, updating status\n");
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
606
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
607 /* Free tune information */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
608 XS_MUTEX_LOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
609 xs_status.sidPlayer->plrDeleteSID(&xs_status);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
610 xs_tuneinfo_free(xs_status.tuneInfo);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
611 xs_status.tuneInfo = NULL;
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
612 XS_MUTEX_UNLOCK(xs_status);
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
613 XSDEBUG("ok\n");
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
614 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
615
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
616
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
617 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
618 * Pause/unpause the playing
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
619 */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
620 void xs_pause(InputPlayback *pb, short pauseState)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
621 {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
622 pb->output->pause(pauseState);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
623 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
624
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
625
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
626 /*
1574
e566e18e9e3d Huge cleanup and some bugfixes. Temporarily breaks / removes sub-tune
Matti Hamalainen <ccr@tnsp.org>
parents: 1564
diff changeset
627 * A stub seek function (Audacious will crash if seek is NULL)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
628 */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
629 void xs_seek(InputPlayback *pb, gint iTime)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
630 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
631 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
632
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
633
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
634 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
635 * Return the playing "position/time"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
636 * Determine current position/time in song. Used by XMMS to update
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
637 * the song clock and position slider and MOST importantly to determine
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
638 * END OF SONG! Return value of -2 means error, XMMS opens an audio
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
639 * error dialog. -1 means end of song (if one was playing currently).
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
640 */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
641 gint xs_get_time(InputPlayback *pb)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
642 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
643 /* If errorflag is set, return -2 to signal it to XMMS's idle callback */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
644 XS_MUTEX_LOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
645 if (xs_status.isError) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
646 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
647 return -2;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
648 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
649
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
650 /* If there is no tune, return -1 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
651 if (!xs_status.tuneInfo) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
652 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
653 return -1;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
654 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
655
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
656 /* If tune has ended, return -1 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
657 if (!xs_status.isPlaying) {
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
658 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
659 return -1;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
660 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
661
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
662 XS_MUTEX_UNLOCK(xs_status);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
663
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
664 /* Return output time reported by audio output plugin */
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
665 return pb->output->output_time();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
666 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
667
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
668
1574
e566e18e9e3d Huge cleanup and some bugfixes. Temporarily breaks / removes sub-tune
Matti Hamalainen <ccr@tnsp.org>
parents: 1564
diff changeset
669 /* Return song information Tuple
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
670 */
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
671 void xs_get_song_tuple_info(Tuple *pResult, t_xs_tuneinfo *pInfo, gint subTune)
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
672 {
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
673 gchar *tmpStr, tmpStr2[64];
1564
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
674
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
675 tuple_associate_string(pResult, "title", pInfo->sidName);
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
676 tuple_associate_string(pResult, "artist", pInfo->sidComposer);
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
677 tuple_associate_string(pResult, "genre", "SID-tune");
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
678 tuple_associate_string(pResult, "copyright", pInfo->sidCopyright);
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
679
1564
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
680 tuple_associate_int(pResult, "subtunes", pInfo->nsubTunes);
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
681 tuple_associate_string(pResult, "sid-format", pInfo->sidFormat);
1564
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
682
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
683 switch (pInfo->sidModel) {
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
684 case XS_SIDMODEL_6581: tmpStr = "6581"; break;
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
685 case XS_SIDMODEL_8580: tmpStr = "8580"; break;
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
686 case XS_SIDMODEL_ANY: tmpStr = "ANY"; break;
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
687 default: tmpStr = "?"; break;
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
688 }
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
689 tuple_associate_string(pResult, "sid-model", tmpStr);
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
690
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
691 /* Get sub-tune information, if available */
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
692 if (subTune < 0 || pInfo->startTune > pInfo->nsubTunes)
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
693 subTune = pInfo->startTune;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
694
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
695 if ((subTune > 0) && (subTune <= pInfo->nsubTunes)) {
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
696 gint tmpInt = pInfo->subTunes[subTune - 1].tuneLength;
1564
5e4393a4c099 Start of major Aud-SID Tuples vs XMMS-SID cleanup.
Matti Hamalainen <ccr@tnsp.org>
parents: 1555
diff changeset
697 tuple_associate_int(pResult, "length", (tmpInt < 0) ? -1 : tmpInt * 1000);
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
698
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
699 tmpInt = pInfo->subTunes[subTune - 1].tuneSpeed;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
700 if (tmpInt > 0) {
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
701 switch (tmpInt) {
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
702 case XS_CLOCK_PAL: tmpStr = "PAL"; break;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
703 case XS_CLOCK_NTSC: tmpStr = "NTSC"; break;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
704 case XS_CLOCK_ANY: tmpStr = "ANY"; break;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
705 case XS_CLOCK_VBI: tmpStr = "VBI"; break;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
706 case XS_CLOCK_CIA: tmpStr = "CIA"; break;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
707 default:
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
708 g_snprintf(tmpStr2, sizeof(tmpStr2), "%dHz", tmpInt);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
709 tmpStr = tmpStr2;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
710 break;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
711 }
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
712 } else
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
713 tmpStr = "?";
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
714
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
715 tuple_associate_string(pResult, "sid-speed", tmpStr);
1579
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
716 } else
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
717 subTune = 1;
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
718
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
719 tuple_associate_int(pResult, "subtune", subTune);
a5725f7f1a5e Chainsaw, this is for you: Separate playlist entries added for sub-tunes;
Matti Hamalainen <ccr@tnsp.org>
parents: 1574
diff changeset
720 tuple_associate_int(pResult, "track-number", subTune);
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
721
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
722 if (xs_cfg.titleOverride)
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
723 tuple_associate_string(pResult, "formatter", xs_cfg.titleFormat);
735
6c3c7b841382 [svn] - sync audacious-sid with latest xmms-sid, from Matti Hamalainen (ccr).
nenolod
parents: 563
diff changeset
724 }
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
725
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
726 Tuple * xs_get_song_tuple(gchar *songFilename)
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
727 {
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
728 Tuple *tmpResult;
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
729 gchar *tmpFilename;
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
730 t_xs_tuneinfo *tmpInfo;
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
731 gint subTune;
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
732
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
733 /* Get information from URL */
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
734 xs_get_trackinfo(songFilename, &tmpFilename, &subTune);
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
735
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
736 tmpResult = tuple_new_from_filename(tmpFilename);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
737 if (!tmpResult) {
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
738 g_free(tmpFilename);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
739 return NULL;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
740 }
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
741
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
742 /* Get tune information from emulation engine */
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
743 XS_MUTEX_LOCK(xs_status);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
744 tmpInfo = xs_status.sidPlayer->plrGetSIDInfo(tmpFilename);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
745 XS_MUTEX_UNLOCK(xs_status);
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
746 g_free(tmpFilename);
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
747
1605
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
748 if (!tmpInfo)
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
749 return tmpResult;
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
750
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
751 xs_get_song_tuple_info(tmpResult, tmpInfo, subTune);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
752 xs_tuneinfo_free(tmpInfo);
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
753
75b8e7737bcd Added support for SID-plugin specific Tuplez format string (see config
Matti Hamalainen <ccr@tnsp.org>
parents: 1593
diff changeset
754 return tmpResult;
1583
2b5768cdca7a Use set_info(), blah and actually add at least the default sub-tune to
Matti Hamalainen <ccr@tnsp.org>
parents: 1582
diff changeset
755 }