comparison src/sid/xmms-sid.c @ 2532:86bfc1159197

Variable rename.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 21 Apr 2008 18:42:00 +0300
parents 1223e8510d8a
children a03d670e8752
comparison
equal deleted inserted replaced
2531:f0ade2681644 2532:86bfc1159197
117 * Initialization functions 117 * Initialization functions
118 */ 118 */
119 void xs_reinit(void) 119 void xs_reinit(void)
120 { 120 {
121 gint player; 121 gint player;
122 gboolean isInitialized; 122 gboolean initialized;
123 123
124 XSDEBUG("xs_reinit() thread = %p\n", g_thread_self()); 124 XSDEBUG("xs_reinit() thread = %p\n", g_thread_self());
125 125
126 /* Stop playing, if we are */ 126 /* Stop playing, if we are */
127 XS_MUTEX_LOCK(xs_status); 127 XS_MUTEX_LOCK(xs_status);
158 158
159 /* Try to initialize emulator engine */ 159 /* Try to initialize emulator engine */
160 XSDEBUG("initializing emulator engine #%i...\n", xs_cfg.playerEngine); 160 XSDEBUG("initializing emulator engine #%i...\n", xs_cfg.playerEngine);
161 161
162 player = 0; 162 player = 0;
163 isInitialized = FALSE; 163 initialized = FALSE;
164 while ((player < xs_nplayerlist) && !isInitialized) { 164 while ((player < xs_nplayerlist) && !initialized) {
165 if (xs_playerlist[player].plrIdent == xs_cfg.playerEngine) { 165 if (xs_playerlist[player].plrIdent == xs_cfg.playerEngine) {
166 if (xs_playerlist[player].plrInit(&xs_status)) { 166 if (xs_playerlist[player].plrInit(&xs_status)) {
167 isInitialized = TRUE; 167 initialized = TRUE;
168 xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[player]; 168 xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[player];
169 } 169 }
170 } 170 }
171 player++; 171 player++;
172 } 172 }
173 173
174 XSDEBUG("init#1: %s, %i\n", (isInitialized) ? "OK" : "FAILED", player); 174 XSDEBUG("init#1: %s, %i\n", (initialized) ? "OK" : "FAILED", player);
175 175
176 player = 0; 176 player = 0;
177 while ((player < xs_nplayerlist) && !isInitialized) { 177 while ((player < xs_nplayerlist) && !initialized) {
178 if (xs_playerlist[player].plrInit(&xs_status)) { 178 if (xs_playerlist[player].plrInit(&xs_status)) {
179 isInitialized = TRUE; 179 initialized = TRUE;
180 xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[player]; 180 xs_status.sidPlayer = (xs_player_t *) & xs_playerlist[player];
181 xs_cfg.playerEngine = xs_playerlist[player].plrIdent; 181 xs_cfg.playerEngine = xs_playerlist[player].plrIdent;
182 } else 182 } else
183 player++; 183 player++;
184 } 184 }
185 185
186 XSDEBUG("init#2: %s, %i\n", (isInitialized) ? "OK" : "FAILED", player); 186 XSDEBUG("init#2: %s, %i\n", (initialized) ? "OK" : "FAILED", player);
187 187
188 188
189 /* Get settings back, in case the chosen emulator backend changed them */ 189 /* Get settings back, in case the chosen emulator backend changed them */
190 xs_cfg.audioFrequency = xs_status.audioFrequency; 190 xs_cfg.audioFrequency = xs_status.audioFrequency;
191 xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample; 191 xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample;