Remove wrong asserts

[ardour.git] / libs / ardour / midi_scene_change.cc

diff --git a/libs/ardour/midi_scene_change.cc b/libs/ardour/midi_scene_change.cc
index db7e8263842cd32839a38f34b5c0c4a965f362e1..969dadbf7596cc66d70c427457c551614c863d38 100644 (file)
--- a/libs/ardour/midi_scene_change.cc
+++ b/libs/ardour/midi_scene_change.cc
@@ -23,7 +23,7 @@
 #include "ardour/midi_port.h"
 #include "ardour/midi_scene_change.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -32,7 +32,6 @@ MIDISceneChange::MIDISceneChange (int c, int b, int p)
        : _bank (b)
        , _program (p)
        , _channel (c & 0xf)
-        , _color (0x00000000) /* note: zero alpha means invisible, which acts as out-of-bound signal */
 {
        if (_bank > 16384) {
                _bank = -1;
@@ -78,7 +77,7 @@ MIDISceneChange::get_bank_lsb_message (uint8_t* buf, size_t size) const
 
        buf[0] = 0xB0 | (_channel & 0xf);
        buf[1] = 0x20;
-       buf[2] = _bank & 0x7f;  
+       buf[2] = _bank & 0x7f;
 
        return 3;
 }
@@ -111,6 +110,8 @@ MIDISceneChange::get_state ()
        node->add_property (X_("bank"), buf);
        snprintf (buf, sizeof (buf), "%d", (int) _channel);
        node->add_property (X_("channel"), buf);
+       snprintf (buf, sizeof (buf), "%u", _color);
+       node->add_property (X_("color"), buf);
 
        return *node;
 }
@@ -122,7 +123,7 @@ MIDISceneChange::set_state (const XMLNode& node, int /* version-ignored */)
                return -1;
        }
 
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property (X_("program"))) == 0) {
                return -1;
@@ -139,26 +140,39 @@ MIDISceneChange::set_state (const XMLNode& node, int /* version-ignored */)
        }
        _channel = atoi (prop->value());
 
+       if ((prop = node.property (X_("color"))) != 0) {
+               _color = atoi (prop->value());
+       } else {
+               _color = out_of_bound_color;
+       }
+
        return 0;
 }
 
 bool
 MIDISceneChange::operator==(const MIDISceneChange& other) const
 {
-        return _program == other._program &&
-                _bank == other._bank &&
-                _channel == other._channel;
+       return _program == other._program &&
+               _bank == other._bank &&
+               _channel == other._channel;
 }
 
 void
-MIDISceneChange::set_color (uint32_t c) 
+MIDISceneChange::set_channel (int channel)
 {
-        _color = c;
-        ColorChanged (); /* EMIT SIGNAL */
+        _channel = channel;
 }
 
-uint32_t
-MIDISceneChange::color() const
+void
+MIDISceneChange::set_program (int program)
 {
-        return _color;
+        _program = program;
 }
+
+void
+MIDISceneChange::set_bank (int bank)
+{
+        _bank = bank;
+}
+
+