[Scummvm-cvs-logs] SF.net SVN: scummvm:[50647] scummvm/trunk/gui/options.cpp

[lordhoto at users.sourceforge.net]

Revision: 50647
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50647&view=rev
Author:   lordhoto
Date:     2010-07-04 17:40:06 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/gui/options.cpp

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2010-07-04 15:06:42 UTC (rev 50646)
+++ scummvm/trunk/gui/options.cpp	2010-07-04 17:40:06 UTC (rev 50647)
@@ -136,10 +136,6 @@
 	}
 }
 
-template<class T> bool equalsDeviceProperty(MusicDevices::iterator d, T lookupProp, Common::MemFunc0<T, MusicDevice> devicePropFunc) {
-	return lookupProp == devicePropFunc(&*d);
-}
-
 bool musicDeviceSkipSettingDefault(MusicDevices::iterator d, Common::String dom, MusicPlugin::List::const_iterator &m, uint32 guio) {
 	return (dom == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS) || (dom != Common::ConfigManager::kApplicationDomain && (!(guio & MidiDriver::musicType2GUIO((uint32)-1)) || (guio & (MidiDriver::musicType2GUIO(d->getMusicType()))))) || d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null" ? true : false;
 }
@@ -810,9 +806,9 @@
 		for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end() && id != -1; m++) {
 			MusicDevices i = (**m)->getDevices();
 			for (MusicDevices::iterator d = i.begin(); d != i.end(); d++) {
-				if ((setting.empty()) ? equalsDeviceProperty(d, preferredType, Common::mem_fun(&MusicDevice::getMusicType)) : equalsDeviceProperty(d, drv, Common::mem_fun(&MusicDevice::getCompleteId))) {
+				if (setting.empty() ? (preferredType == d->getMusicType()) : (drv == d->getCompleteId())) {
 					popup->setSelected(id);
-					id = -1;												
+					id = -1;
 					break;
 				} else if (skipfunc(d, _domain, m, _guioptions)) {
 					id++;
@@ -821,7 +817,7 @@
 		}
 		if (id != -1)
 			// midi device turned off or whatever
-			return false;		
+			return false;
 	} else {
 		return false;
 	}


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