Merged with trunk R1705.

Synced .po files with trunk.
Fixed more editor operations to be type agnostic (ie not audio only).


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

12 files changed, 56 insertions, 7 deletions

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 913cd7d5ed..149ceb7dc3 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -81,6 +81,7 @@ class AudioFileSource : public AudioSource {
 	virtual void           mark_capture_start (nframes_t) {}
 	virtual void           mark_capture_end () {}
 	virtual void           clear_capture_marks() {}
+	virtual bool           one_of_several_channels () const { return false; }
 
 	virtual int update_header (nframes_t when, struct tm&, time_t) = 0;
 	virtual int flush_header () = 0;
@@ -161,7 +162,7 @@ class AudioFileSource : public AudioSource {
 	virtual void set_timeline_position (int64_t pos);
 	virtual void set_header_timeline_position () = 0;
 
-	bool find (Glib::ustring& path, bool must_exist, bool& is_new);
+	bool find (Glib::ustring& path, bool must_exist, bool& is_new, uint16_t& chan);
 	bool removable() const;
 	bool writable() const { return _flags & Writable; }
 };
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 3b592a54ee..e25278cce9 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -89,6 +89,8 @@ class AudioRegion : public Region
 	int      set_state (const XMLNode&);
 
 	static void set_default_fade (float steepness, nframes_t len);
+	bool fade_in_is_default () const;
+	bool fade_out_is_default () const;
 
 	enum FadeShape {
 		Linear,
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h
index 674a9232b5..4f0bae1208 100644
--- a/libs/ardour/ardour/configuration_vars.h
+++ b/libs/ardour/ardour/configuration_vars.h
@@ -17,7 +17,6 @@ CONFIG_VARIABLE (bool, send_mtc, "send-mtc", false)
 CONFIG_VARIABLE (bool, send_mmc, "send-mmc", false)
 CONFIG_VARIABLE (bool, mmc_control, "mmc-control", false)
 CONFIG_VARIABLE (bool, midi_feedback, "midi-feedback", false)
-CONFIG_VARIABLE (bool, midi_control, "midi-control", false)
 CONFIG_VARIABLE (uint8_t, mmc_device_id, "mmc-device-id", 0)
 
 /* control surfaces */
diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index 63c50d7cfb..ad21188531 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -52,7 +52,7 @@ class CoreAudioSource : public AudioFileSource {
 	mutable nframes_t tmpbufsize;
 	mutable Glib::Mutex _tmpbuf_lock;
 
-	void init (string str);
+	void init ();
 };
 
 }; /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 10b3bbfe92..4809e17868 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -281,6 +281,7 @@ class Diskstream : public PBD::StatefulDestructible
 	nframes_t            file_frame;		
 	nframes_t            playback_sample;
 	nframes_t            playback_distance;
+	bool                 commit_should_unlock;
 
 	uint32_t                 _read_data_count;
 	uint32_t                 _write_data_count;
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 54863b6fb0..b1612f39d5 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -141,6 +141,12 @@ class Playlist : public PBD::StatefulDestructible, public boost::enable_shared_f
 	
 	virtual bool destroy_region (boost::shared_ptr<Region>) = 0;
 
+	/* special case function used by UI selection objects, which have playlists that actually own the regions
+	   within them.
+	*/
+
+	void drop_regions ();
+
   protected:
 	friend class Session;
 
@@ -180,6 +186,7 @@ class Playlist : public PBD::StatefulDestructible, public boost::enable_shared_f
 	bool             save_on_thaw;
 	string           last_save_reason;
 	uint32_t         in_set_state;
+	bool             first_set_state;
 	bool            _hidden;
 	bool            _splicing;
 	bool            _nudging;
diff --git a/libs/ardour/ardour/profile.h b/libs/ardour/ardour/profile.h
new file mode 100644
index 0000000000..2ee47d39ea
--- /dev/null
+++ b/libs/ardour/ardour/profile.h
@@ -0,0 +1,31 @@
+#ifndef __ardour_profile_h__
+#define __ardour_profile_h__
+
+#include <boost/dynamic_bitset.hpp>
+#include <stdint.h>
+
+namespace ARDOUR {
+
+class RuntimeProfile {
+  public:
+    enum Element {
+	    SmallScreen,
+	    LastElement
+    };
+    
+    RuntimeProfile() { bits.resize (LastElement); }
+    ~RuntimeProfile() {}
+
+    void set_small_screen() { bits[SmallScreen] = true; }
+    bool get_small_screen() const { return bits[SmallScreen]; }
+
+  private:
+    boost::dynamic_bitset<uint64_t> bits;
+    
+};
+
+extern RuntimeProfile* Profile;
+
+}; // namespace ARDOUR
+
+#endif /* __ardour_profile_h__ */
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 70091ef85d..6247d79a27 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -169,9 +169,9 @@ class Route : public IO
 	int copy_redirects (const Route&, Placement, uint32_t* err_streams = 0);
 	int sort_redirects (uint32_t* err_streams = 0);
 
-	void clear_redirects (void *src);
+	void clear_redirects (Placement, void *src);
 	void all_redirects_flip();
-	void all_redirects_active (bool state);
+	void all_redirects_active (Placement, bool state);
 
 	virtual nframes_t update_total_latency();
 	nframes_t signal_latency() const { return _own_latency; }
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index d4c0572811..4e3c0fbe2d 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -38,7 +38,7 @@ class Send : public Redirect
 	Send (Session&, Placement);
 	Send (Session&, const XMLNode&);
 	Send (const Send&);
-	~Send ();
+	virtual ~Send ();
 
 	uint32_t bit_slot() const { return bitslot; }
 	
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 2022b21a05..a95b07a2e7 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -371,6 +371,7 @@ class Session : public PBD::StatefulDestructible
 	void set_session_start (nframes_t start) { start_location->set_start(start); }
 	void set_session_end (nframes_t end) { end_location->set_start(end); _end_location_is_free = false; }
 	void use_rf_shuttle_speed ();
+	void allow_auto_play (bool yn);
 	void request_transport_speed (float speed);
 	void request_overwrite_buffer (Diskstream*);
 	void request_diskstream_speed (Diskstream&, float speed);
@@ -424,6 +425,8 @@ class Session : public PBD::StatefulDestructible
 	int save_template (string template_name);
         int save_history (string snapshot_name = "");
         int restore_history (string snapshot_name);
+	void remove_state (string snapshot_name);
+	void rename_state (string old_name, string new_name);
 
 	static int rename_template (string old_name, string new_name);
 
@@ -1004,6 +1007,7 @@ class Session : public PBD::StatefulDestructible
 	volatile float          _transport_speed;
 	volatile float          _desired_transport_speed;
 	float                   _last_transport_speed;
+	bool                     auto_play_legal;
 	nframes_t          _last_slave_transport_frame;
 	nframes_t           maximum_output_latency;
 	nframes_t           last_stop_frame;
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 2fc3872887..916e9da49e 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -56,6 +56,8 @@ class SndFileSource : public AudioFileSource {
 
 	bool set_destructive (bool yn);
 
+	bool one_of_several_channels () const;
+
 	static void setup_standard_crossfades (nframes_t sample_rate);
 	static const AudioFileSource::Flag default_writable_flags;
 
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 45c91950fc..7b1179b81a 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -82,7 +82,9 @@ class Source : public PBD::StatefulDestructible
 	time_t            _timestamp;
 	jack_nframes_t    _length;
 
-	std::set<boost::shared_ptr<ARDOUR::Playlist> > _playlists;
+	Glib::Mutex playlist_lock;
+	typedef std::map<boost::shared_ptr<ARDOUR::Playlist>, uint32_t > PlaylistMap;
+	PlaylistMap _playlists;
 
   private:
 	uint32_t          _in_use;