Mercurial > hg > xmms-sid

changeset 784:45b8649f0ef9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 06 Nov 2012 13:44:46 +0200
parents 37ab2fba30c8
children fcda6f365e02
files src/xs_player.c
diffstat 1 files changed, 38 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/src/xs_player.c	Tue Nov 06 13:34:25 2012 +0200
+++ b/src/xs_player.c	Tue Nov 06 13:44:46 2012 +0200
@@ -10,64 +10,68 @@
 
 /* List of emulator engines
  */
-static const XSEngine xs_enginelist[] = {
+static const XSEngine xs_enginelist[] =
+{
 #ifdef HAVE_SIDPLAY1
-    {XS_ENG_SIDPLAY1,
-     xs_sidplay1_probe,
-     xs_sidplay1_init, xs_sidplay1_close,
-     xs_sidplay1_initsong, xs_sidplay1_fillbuffer,
-     xs_sidplay1_load, xs_sidplay1_delete,
-     xs_sidplay1_getinfo, xs_sidplay1_updateinfo,
-     NULL
+    {
+        XS_ENG_SIDPLAY1,
+        xs_sidplay1_probe,
+        xs_sidplay1_init, xs_sidplay1_close,
+        xs_sidplay1_initsong, xs_sidplay1_fillbuffer,
+        xs_sidplay1_load, xs_sidplay1_delete,
+        xs_sidplay1_getinfo, xs_sidplay1_updateinfo,
+        NULL
     },
 #endif
 #ifdef HAVE_SIDPLAY2
-    {XS_ENG_SIDPLAY2,
-     xs_sidplay2_probe,
-     xs_sidplay2_init, xs_sidplay2_close,
-     xs_sidplay2_initsong, xs_sidplay2_fillbuffer,
-     xs_sidplay2_load, xs_sidplay2_delete,
-     xs_sidplay2_getinfo, xs_sidplay2_updateinfo,
-     xs_sidplay2_flush
+    {
+        XS_ENG_SIDPLAY2,
+        xs_sidplay2_probe,
+        xs_sidplay2_init, xs_sidplay2_close,
+        xs_sidplay2_initsong, xs_sidplay2_fillbuffer,
+        xs_sidplay2_load, xs_sidplay2_delete,
+        xs_sidplay2_getinfo, xs_sidplay2_updateinfo,
+        xs_sidplay2_flush
     },
 #endif
 };
 
-static const gint xs_nenginelist = (sizeof(xs_enginelist) / sizeof(xs_enginelist[0]));
+static const gint xs_nenginelist = sizeof(xs_enginelist) / sizeof(xs_enginelist[0]);
 
 
 gboolean xs_init_emu_engine(int *configured, XSEngineState *status)
 {
     gint engine;
-    gboolean initialized;
+    gboolean initialized = FALSE;
     
     XSDEBUG("initializing emulator engine #%i...\n", *configured);
 
-    engine = 0;
-    initialized = FALSE;
-    while (engine < xs_nenginelist && !initialized) {
-        if (xs_enginelist[engine].plrIdent == *configured) {
-            if (xs_enginelist[engine].plrInit(status)) {
-                initialized = TRUE;
-                status->engine = (XSEngine *) & xs_enginelist[engine];
-            }
+    for (engine = 0; engine < xs_nenginelist && !initialized; engine++)
+    {
+        if (xs_enginelist[engine].plrIdent == *configured &&
+            xs_enginelist[engine].plrInit(status))
+        {
+            initialized = TRUE;
+            status->engine = &xs_enginelist[engine];
         }
-        engine++;
     }
 
-    XSDEBUG("init#1: %s, %i\n", initialized ? "OK" : "FAILED", engine);
+    XSDEBUG("init#1: %s, %i\n", initialized ? "OK" : "FAILED", *configured);
 
-    engine = 0;
-    while (engine < xs_nenginelist && !initialized) {
-        if (xs_enginelist[engine].plrInit(status)) {
+#if 0
+    for (engine = 0; engine < xs_nenginelist && !initialized; engine++)
+    {
+        if (xs_enginelist[engine].plrInit(status))
+        {
             initialized = TRUE;
-            status->engine = (XSEngine *) &xs_enginelist[engine];
+            status->engine = &xs_enginelist[engine];
             *configured = xs_enginelist[engine].plrIdent;
-        } else
-            engine++;
+        }
     }
 
-    XSDEBUG("init#2: %s, %i\n", initialized ? "OK" : "FAILED", engine);
+    XSDEBUG("init#2: %s, %i\n", initialized ? "OK" : "FAILED", *configured);
+#endif
+
     return initialized;
 }