[Scummvm-cvs-logs] SF.net SVN: scummvm:[40456] scummvm/trunk/engines/sci/sfx/device/devices. cpp

[thebluegr at users.sourceforge.net]

Revision: 40456
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40456&view=rev
Author:   thebluegr
Date:     2009-05-11 17:08:31 +0000 (Mon, 11 May 2009)

Log Message:
-----------
Merged find_dev() inside sfx_find_device()

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/device/devices.cpp

Modified: scummvm/trunk/engines/sci/sfx/device/devices.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/device/devices.cpp	2009-05-11 17:07:38 UTC (rev 40455)
+++ scummvm/trunk/engines/sci/sfx/device/devices.cpp	2009-05-11 17:08:31 UTC (rev 40456)
@@ -47,24 +47,22 @@
 	devices_opl2,
 };
 
-static struct _midi_device *find_dev(int type, char *name) {
+void *sfx_find_device(int type, char *name) {
+	struct _midi_device *dev = NULL;
 	int i = 0;
 
 	if (!type)
 		return NULL;
 
-	if (!name)
-		return devices[type][0];
+	if (!name) {
+		dev = devices[type][0];
+	} else {
+		while (devices[type][i] && !strcmp(name, devices[type][i]->name))
+			++i;
 
-	while (devices[type][i] && !strcmp(name, devices[type][i]->name))
-		++i;
+		dev = devices[type][i];
+	}
 
-	return devices[type][i];
-}
-
-void *sfx_find_device(int type, char *name) {
-	struct _midi_device *dev = find_dev(type, name);
-
 	if (dev) {
 		if (dev->init(dev)) {
 			fprintf(stderr, "[SFX] Opening device '%s' failed\n", dev->name);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.