Fix bumping .mid file name (snapshots & playlist copy)

[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 db903c21ebe5628f3a8060d2465732ca47888ec8..75fcf32d9199f4cf28a22f0603f753cffc6e973c 100644 (file)
--- a/libs/ardour/midi_scene_change.cc
+++ b/libs/ardour/midi_scene_change.cc
@@ -19,22 +19,20 @@
 
 #include "pbd/error.h"
 #include "pbd/compose.h"
+#include "pbd/types_convert.h"
 
 #include "ardour/midi_port.h"
 #include "ardour/midi_scene_change.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;
 
-const uint32_t MIDISceneChange::out_of_bound_color = 0x00000000; /* note: zero alpha means invisible, which acts as out-of-bound signal */
-
 MIDISceneChange::MIDISceneChange (int c, int b, int p)
        : _bank (b)
        , _program (p)
        , _channel (c & 0xf)
-        , _color (out_of_bound_color)
 {
        if (_bank > 16384) {
                _bank = -1;
@@ -49,7 +47,6 @@ MIDISceneChange::MIDISceneChange (const XMLNode& node, int version)
        : _bank (-1)
        , _program (-1)
        , _channel (-1)
-        , _color (out_of_bound_color)
 {
        set_state (node, version);
 }
@@ -81,7 +78,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;
 }
@@ -102,20 +99,14 @@ MIDISceneChange::get_program_message (uint8_t* buf, size_t size) const
 XMLNode&
 MIDISceneChange::get_state ()
 {
-       char buf[32];
        XMLNode* node = new XMLNode (SceneChange::xml_node_name);
 
-       node->add_property (X_("type"), X_("MIDI"));
-       snprintf (buf, sizeof (buf), "%d", (int) _program);
-       node->add_property (X_("id"), id().to_s());
-       snprintf (buf, sizeof (buf), "%d", (int) _program);
-       node->add_property (X_("program"), buf);
-       snprintf (buf, sizeof (buf), "%d", (int) _bank);
-       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);
+       node->set_property (X_("type"), X_("MIDI"));
+       node->set_property (X_("id"), id());
+       node->set_property (X_("program"), _program);
+       node->set_property (X_("bank"), _bank);
+       node->set_property (X_("channel"), _channel);
+       node->set_property (X_("color"), _color);
 
        return *node;
 }
@@ -127,28 +118,14 @@ MIDISceneChange::set_state (const XMLNode& node, int /* version-ignored */)
                return -1;
        }
 
-       const XMLProperty* prop;
-
-       if ((prop = node.property (X_("program"))) == 0) {
+       if (!node.get_property (X_("program"), _program) || !node.get_property (X_("bank"), _bank) ||
+           !node.get_property (X_("channel"), _channel)) {
                return -1;
        }
-       _program = atoi (prop->value());
 
-       if ((prop = node.property (X_("bank"))) == 0) {
-               return -1;
+       if (!node.get_property (X_("color"), _color)) {
+               _color = out_of_bound_color;
        }
-       _bank = atoi (prop->value());
-
-       if ((prop = node.property (X_("channel"))) == 0) {
-               return -1;
-       }
-       _channel = atoi (prop->value());
-
-       if ((prop = node.property (X_("color"))) != 0) {
-                _color = atoi (prop->value());
-        } else {
-                _color = out_of_bound_color;
-        }
 
        return 0;
 }
@@ -156,20 +133,27 @@ MIDISceneChange::set_state (const XMLNode& node, int /* version-ignored */)
 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;
+}
+
+