Merged with trunk R1761

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

2 files changed, 19 insertions, 9 deletions

diff --git a/tools/osx_packaging/ardour2_mac_ui.rc b/tools/osx_packaging/ardour2_mac_ui.rc
index 6528257e74..977bc649e5 100644
--- a/tools/osx_packaging/ardour2_mac_ui.rc
+++ b/tools/osx_packaging/ardour2_mac_ui.rc
@@ -448,6 +448,7 @@ style "editor_hscrollbar" = "ardour_adjusters"
 	# make it bigger.
 	# 
 	GtkRange::slider_width = 27
+        GtkScrollbar::slider_width = 27
 }
 
 style "ardour_progressbars" = "default_buttons_menus"
diff --git a/tools/session_exchange.py b/tools/session_exchange.py
index 825476c967..9ba266e970 100755
--- a/tools/session_exchange.py
+++ b/tools/session_exchange.py
@@ -111,6 +111,7 @@ class Data(object):
 		sessions[session_name]['collabs'][collab_name]['sounds'] = []
 		sessions[session_name]['collabs'][collab_name]['ip'] = ip_address
 		sessions[session_name]['collabs'][collab_name]['port'] = port
+		sessions[session_name]['collabs'][collab_name]['v2paths'] = true
 		self._data['sessions'] = sessions
 		
 		client = ExchangeClientFactory(session_name, collab_name, None, self.debug_mode)
@@ -129,6 +130,10 @@ class Data(object):
 		sessions[session_name]['collabs'][self._data['user']] = {}
 		sessions[session_name]['collabs'][self._data['user']]['snaps'] = []
 		sessions[session_name]['collabs'][self._data['user']]['sounds'] = []
+		if os.path.test (os.path.join (session_path,'sounds')):
+			sessions[session_name]['collabs'][collab_name]['v2paths'] = False
+		else:
+			sessions[session_name]['collabs'][collab_name]['v2paths'] = True
 		
 		self._data['sessions'] = sessions
 		
@@ -150,7 +155,8 @@ class Data(object):
 	def create_session(self, session_path):
 		try:
 			os.mkdir(session_path)
-			os.mkdir(session_path+"/sounds")
+			os.mkdir(os.path.join (session_path,'interchange',session_name,'audiofiles'))
+
 		except OSError:
 			raise_error("Could not create session directory", g_display.window)
 			return
@@ -230,7 +236,10 @@ class Data(object):
 	
 	def _scan_sounds(self, session):
 		sounds = []
-		files = os.listdir(session+'/sounds')
+		if v2paths:
+			files = os.listdir(os.path.join (session,'interchange', session, 'audiofiles'))
+		else:
+			files = os.listdir(os.path.join (session,'sounds'))
 		pattern = re.compile(r'\.peak$')
 		for file in files:
 			if not pattern.search(file):
@@ -755,21 +764,21 @@ class ArdourShareWindow(object):
 		#need to hold a reference to the item_factory or the menubar will disappear.
 		self.item_factory = gtk.ItemFactory(gtk.MenuBar, '<main>', accel_group)
 		self.item_factory.create_items(menu_items, self.window)
-		main_box.pack_start(self.item_factory.get_widget('<main>'), gtk.FALSE)
+		main_box.pack_start(self.item_factory.get_widget('<main>'), False)
 		
 		pane1 = gtk.HPaned()
 		pane2 = gtk.HPaned()
-		pane1.pack2(pane2, gtk.TRUE, gtk.FALSE)
+		pane1.pack2(pane2, True, False)
 		
 		scroll1 = gtk.ScrolledWindow()
 		scroll1.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-		pane1.pack1(scroll1, gtk.TRUE, gtk.FALSE)
+		pane1.pack1(scroll1, True, False)
 		scroll2 = gtk.ScrolledWindow()
 		scroll2.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-		pane2.pack1(scroll2, gtk.TRUE, gtk.FALSE)
+		pane2.pack1(scroll2, True, False)
 		scroll3 = gtk.ScrolledWindow()
 		scroll3.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-		pane2.pack2(scroll3, gtk.TRUE, gtk.FALSE)
+		pane2.pack2(scroll3, True, False)
 		
 		self.session_model = gtk.ListStore(gobject.TYPE_STRING)
 		view1 = gtk.TreeView(self.session_model)
@@ -797,10 +806,10 @@ class ArdourShareWindow(object):
 		self.snap_selection.connect("changed", self.cb_snap_selection_changed)
 		scroll3.add(view3)
 		
-		main_box.pack_start(pane1, gtk.TRUE, gtk.TRUE)
+		main_box.pack_start(pane1, True, True)
 		
 		self.status_bar = gtk.Statusbar()
-		main_box.pack_start(self.status_bar, gtk.FALSE)
+		main_box.pack_start(self.status_bar, False)
 		self._status_cid = self.status_bar.get_context_id('display')
 		self._status_mid = ''