Changeset 1272

Timestamp:

10/05/07 16:51:47 (13 months ago)

Author:

calvin

Message:

machine view plugin type theme fixes

Files:

• trunk/src/buzelib/MachineView.cpp (modified) (5 diffs)

trunk/src/buzelib/MachineView.cpp

@@ -1170 +1170 @@
                 return effectPanBrush;
         }
-
-        assert(false);  // should never get here
         return generatorPanBrush;
 }
@@ -1178 +1176 @@
         if ((machine->getFlags() & PLUGIN_FLAGS_MASK) == ROOT_PLUGIN_FLAGS) {
                 return masterBgBrush;
-        } else
-        if ((machine->getFlags() & PLUGIN_FLAGS_MASK) == GENERATOR_PLUGIN_FLAGS) {
-                if (machine->isMuted() || machine->isBypassed())
-                        return generatorMuteBrush; else
-                        return generatorBgBrush;
         } else
         if ((machine->getFlags() & PLUGIN_FLAGS_MASK) == EFFECT_PLUGIN_FLAGS) {
@@ -1188 +1181 @@
                         return effectMuteBrush;
                         return effectBgBrush;
-        }
-
-        assert(false);  // should never get here
-        return masterBgBrush;
+        } else {
+                if (machine->isMuted() || machine->isBypassed())
+                        return generatorMuteBrush; else
+                        return generatorBgBrush;
+        }
 }
 
@@ -1205 +1199 @@
                         return masterLedOnBrush;
                 } else
-                        assert(false);
+                        return generatorLedOnBrush;
         } else {
                 if ((machine->getFlags() & PLUGIN_FLAGS_MASK) == EFFECT_PLUGIN_FLAGS) {
@@ -1216 +1210 @@
                         return masterLedOffBrush;
                 } else
-                        assert(false);
-        }
-        
-        assert(false);  // should never get here
-        return masterLedOffBrush;
+                        return generatorLedOffBrush;
+        }
 }