Mercurial > hg > xmms-sid

diff src/xs_sidplay.h @ 820:778531e968ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up tune loading.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 07 Nov 2012 16:08:40 +0200
parents dfda3d47baf7
children ae1f6418d093
line wrap: on
line diff
--- a/src/xs_sidplay.h	Wed Nov 07 15:26:45 2012 +0200
+++ b/src/xs_sidplay.h	Wed Nov 07 16:08:40 2012 +0200
@@ -92,7 +92,6 @@
 gboolean TFUNCTION2(XSEngineState *state)
 {
     TTUNEINFO info;
-    TTUNE *tune;
     TENGINE *engine;
     
     /* Check if we have required structures initialized */
@@ -100,16 +99,15 @@
         return FALSE;
 
     engine = (TENGINE *) state->internal;
-    tune = engine->tune;
-    if (!tune)
+    if (!(engine->tune))
         return FALSE;
 
     /* Get currently playing tune information */
 #ifdef XS_SIDPLAY1_H
-    tune->getInfo(info);
+    engine->tune->getInfo(info);
 #endif
 #ifdef XS_SIDPLAY2_H
-    info = tune->getInfo();
+    info = engine->tune.getInfo();
 #endif
 
     /* NOTICE! Here we assume that libSIDPlay[12] headers define