merge changes from trunk

git-svn-id: svn://localhost/ardour2/branches/2.0.1@1790 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 35 insertions, 34 deletions

diff --git a/SConstruct b/SConstruct
index 3cf983c9ff..df835b593c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-ardour_version = '2.0'
+ardour_version = '2.0.1'
 
 subst_dict = { }
 
@@ -834,6 +834,8 @@ if env['SYSLIBS']:
     libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0')
     libraries['glibmm2'] = LibraryInfo()
     libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4')
+    libraries['cairomm'] = LibraryInfo()
+    libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0')
     libraries['gdkmm2'] = LibraryInfo()
     libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4')
     libraries['gtkmm2'] = LibraryInfo()
@@ -860,7 +862,7 @@ if env['SYSLIBS']:
     libraries['soundtouch'] = LibraryInfo()
     libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
     # Comment the previous line and uncomment this for Debian:
-	#libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
 
     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
                                             LIBPATH='#libs/appleutility',
diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h
index 2831384cd3..596467d3e1 100644
--- a/gtk2_ardour/export_dialog.h
+++ b/gtk2_ardour/export_dialog.h
@@ -20,19 +20,7 @@
 #ifndef __ardour_export_dialog_h__
 #define __ardour_export_dialog_h__
 
-#include <gtkmm/alignment.h>
-#include <gtkmm/box.h>
-#include <gtkmm/table.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/frame.h>
-#include <gtkmm/button.h>
-#include <gtkmm/progressbar.h>
-#include <gtkmm/scrolledwindow.h>
-#include <gtkmm/fileselection.h>
-#include <gtkmm/filechooser.h>
-#include <gtkmm/comboboxtext.h>
-#include <gtkmm/treeview.h>
-#include <gtkmm/liststore.h>
+#include <gtkmm.h>
 
 #include <ardour/export.h>
 #include <ardour/location.h>
diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index bb8ada746f..8456654f20 100644
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -38,6 +38,7 @@ ControlProtocol::ControlProtocol (Session& s, string str)
 	  _name (str)
 {
 	_active = false;
+	session->RouteAdded.connect (mem_fun(*this, &ControlProtocol::add_strip));
 }
 
 ControlProtocol::~ControlProtocol ()
@@ -45,6 +46,12 @@ ControlProtocol::~ControlProtocol ()
 }
 
 void
+ControlProtocol::add_strip (std::list<boost::shared_ptr<ARDOUR::Route> >)
+{
+	route_list_changed();
+}
+	
+void
 ControlProtocol::next_track (uint32_t initial_id)
 {
 	uint32_t limit = session->nroutes();
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<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 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:*