From: Paul Davis Date: Mon, 7 May 2007 14:13:25 +0000 (+0000) Subject: fix #1637 (needs merging to 2.0.1 branch); remove debug printf X-Git-Tag: 3.0-alpha5~4938^2~2 X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=185be4e841e182bbe7cb7820f9cb6371ebebe15d 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 8ff4082d60..96b1ab591e 100644 --- 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::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) { RegionView* rv; RegionView* nrv; - AudioRegionView* arv = dynamic_cast(rv); - MidiRegionView* mrv = dynamic_cast(rv); rv = (*i); - if (arv) + AudioRegionView* arv = dynamic_cast(rv); + MidiRegionView* mrv = dynamic_cast(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::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 bd30ae0eeb..929101fe6d 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -346,8 +346,6 @@ AudioPlaylist::check_dependents (boost::shared_ptr r, bool norefresh) return; } - cerr << "Check dependents of " << r->name() << endl; - if ((region = boost::dynamic_pointer_cast (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 9e382a6a6e..ff549f9896 100644 --- 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 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 1ef7a2c1b4..708373e3bc 100644 --- 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 >) +{ + 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 c0961645ab..b787aeeb8f 100644 --- 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 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 >); + 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 c635b8b6a6..ed279ba308 100644 --- 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:*