fix #1637 (needs merging to 2.0.1 branch); remove debug printf

git-svn-id: svn://localhost/ardour2/branches/midi@1791 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 8ff4082d6048b1ff6146c9850ecd4d2dac9f93a3..96b1ab591e9ce571a48a555e6ef41f86fb2af731 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2775,17 +2775,19 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
                for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
                        RegionView* rv;
                        RegionView* nrv;
-                       AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
-                       MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(rv);
 
                        rv = (*i);
 
-                       if (arv)        
+                       AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
+                       MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(rv);
+
+                       if (arv) {
                                nrv = new AudioRegionView (*arv);
-                       else if (mrv)
+                       } else if (mrv) {
                                nrv = new MidiRegionView (*mrv);
-                       else
+                       } else {
                                continue;
+                       }
 
                        nrv->get_canvas_group()->show ();
 
@@ -3244,12 +3246,6 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 
        if (drag_info.first_move) {
                /* just a click */
-
-               if (drag_info.copy) {
-                       for (list<RegionView*>::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
-                               copies.push_back (*i);
-                       }
-               }
                goto out;
        }
 

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index bd30ae0eeb74f7481b33e805fc92272ba24595c6..929101fe6d005098cdbd8f0f619da0c2984058bc 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -346,8 +346,6 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
                return;
        }
 
-       cerr << "Check dependents of " << r->name() << endl;
-
        if ((region = boost::dynamic_pointer_cast<AudioRegion> (r)) == 0) {
                fatal << _("programming error: non-audio Region tested for overlap in audio playlist")
                      << endmsg;

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9e382a6a6e9a1b86dab005a8d85fd8a378c25b25..ff549f9896ba08599916241eed00d80f0de516ab 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1920,11 +1920,13 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
                do {
                        snprintf (bus_name, sizeof(bus_name), "Bus %" PRIu32, bus_id);
 
+                       bus_id++;
+
                        if (route_by_name (bus_name) == 0) {
                                break;
                        }
 
-               } while (++bus_id < (UINT_MAX-1));
+               } while (bus_id < (UINT_MAX-1));
 
                try {
                        shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));

diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index 1ef7a2c1b492405e6f3ee15eca03f245336c5666..708373e3bc590239189ec6d19bf8ca59b582f37c 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -38,12 +38,19 @@ ControlProtocol::ControlProtocol (Session& s, string str)
          _name (str)
 {
        _active = false;
+       session->RouteAdded.connect (mem_fun(*this, &ControlProtocol::add_strip));
 }
 
 ControlProtocol::~ControlProtocol ()
 {
 }
 
+void
+ControlProtocol::add_strip (std::list<boost::shared_ptr<ARDOUR::Route> >)
+{
+       route_list_changed();
+}
+       
 void
 ControlProtocol::next_track (uint32_t initial_id)
 {

diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
index c0961645ab4fdf42f2d3b2d6a958ab15155d5863..b787aeeb8f65ca5247a571217a2a9a1a485f454d 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -47,6 +47,8 @@ class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI
        virtual int set_feedback (bool yn) { return 0; }
        virtual bool get_feedback () const { return false; }
 
+       virtual void route_list_changed () {}
+
        sigc::signal<void> ActiveChanged;
 
        /* signals that a control protocol can emit and other (presumably graphical)
@@ -101,6 +103,8 @@ class ControlProtocol : public sigc::trackable, public Stateful, public BasicUI
        std::string _name;
        bool _active;
 
+       void add_strip (std::list<boost::shared_ptr<ARDOUR::Route> >);
+
        void next_track (uint32_t initial_id);
        void prev_track (uint32_t initial_id);
 };

diff --git a/tools/osx_packaging/etc/pango/pango.modules b/tools/osx_packaging/etc/pango/pango.modules
index c635b8b6a6d438b9ea8d42db9d7a1a82c4d2f4fe..ed279ba30866da0ed0b52f4a792e75c0e64defdd 100644 (file)
--- a/tools/osx_packaging/etc/pango/pango.modules
+++ b/tools/osx_packaging/etc/pango/pango.modules
@@ -3,22 +3,22 @@
 #
 # ModulesPath = "${CWD}/lib/pango/1.5.0/modules"
 #
-${CWD}/lib/pango/1.5.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:*
-${CWD}/lib/pango/1.5.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* common:
-${CWD}/lib/pango/1.5.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common:
-${CWD}/lib/pango/1.5.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*
-${CWD}/lib/pango/1.5.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
-${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
-${CWD}/lib/pango/1.5.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
-${CWD}/lib/pango/1.5.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
-${CWD}/lib/pango/1.5.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
-${CWD}/lib/pango/1.5.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*
+"${CWD}/lib/pango/1.5.0/modules/pango-arabic-fc.so" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:*
+"${CWD}/lib/pango/1.5.0/modules/pango-basic-fc.so" BasicScriptEngineFc PangoEngineShape PangoRenderFc armenian:* bopomofo:* cherokee:* coptic:* cyrillic:* deseret:* ethiopic:* georgian:* gothic:* greek:* han:* hiragana:* katakana:* latin:* ogham:* old-italic:* runic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* common:
+"${CWD}/lib/pango/1.5.0/modules/pango-basic-x.so" BasicScriptEngineX PangoEngineShape PangoRenderX common:
+"${CWD}/lib/pango/1.5.0/modules/pango-hangul-fc.so" HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:*
+"${CWD}/lib/pango/1.5.0/modules/pango-hebrew-fc.so" HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:*
+"${CWD}/lib/pango/1.5.0/modules/pango-indic-fc.so" sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:*
+"${CWD}/lib/pango/1.5.0/modules/pango-khmer-fc.so" KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:*
+"${CWD}/lib/pango/1.5.0/modules/pango-syriac-fc.so" SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:*
+"${CWD}/lib/pango/1.5.0/modules/pango-thai-fc.so" ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:*
+"${CWD}/lib/pango/1.5.0/modules/pango-tibetan-fc.so" TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:*