smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 21:56:30 +01:00
Code Issues Projects Releases Wiki Activity

make session exchange run again

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@1744 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-04-25 13:44:21 +00:00
parent ac61c228eb
commit a76d015b8b
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SConstruct
View file

@ -1108,7 +1108,6 @@ env.Distribute (env['DISTTREE'],
[ 'SConstruct', 'svn_revision.h', [ 'SConstruct', 'svn_revision.h',
'COPYING', 'PACKAGER_README', 'README', 'COPYING', 'PACKAGER_README', 'README',
'ardour.rc.in', 'ardour.rc.in',
'ardour_system.rc',
'tools/config.guess', 'tools/config.guess',
'icons/icon/ardour_icon_mac_mask.png', 'icons/icon/ardour_icon_mac_mask.png',
'icons/icon/ardour_icon_mac.png', 'icons/icon/ardour_icon_mac.png',

25
tools/session_exchange.py
View file

@ -130,7 +130,10 @@ class Data(object):
sessions[session_name]['collabs'][self._data['user']] = {} sessions[session_name]['collabs'][self._data['user']] = {}
sessions[session_name]['collabs'][self._data['user']]['snaps'] = [] sessions[session_name]['collabs'][self._data['user']]['snaps'] = []
sessions[session_name]['collabs'][self._data['user']]['sounds'] = [] sessions[session_name]['collabs'][self._data['user']]['sounds'] = []
sessions[session_name]['collabs'][collab_name]['v2paths'] = !os.path.test (os.path.join (session_path,'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 self._data['sessions'] = sessions
@ -152,10 +155,8 @@ class Data(object):
def create_session(self, session_path): def create_session(self, session_path):
try: try:
os.mkdir(session_path) os.mkdir(session_path)
if v2paths: os.mkdir(os.path.join (session_path,'interchange',session_name,'audiofiles'))
os.mkdir(os.path.join (session_path,'interchange',session_name,'audiofiles')
else:
os.mkdir(os.path.join (session_path,'sounds')
except OSError: except OSError:
raise_error("Could not create session directory", g_display.window) raise_error("Could not create session directory", g_display.window)
return return
@ -763,21 +764,21 @@ class ArdourShareWindow(object):
#need to hold a reference to the item_factory or the menubar will disappear. #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 = gtk.ItemFactory(gtk.MenuBar, '<main>', accel_group)
self.item_factory.create_items(menu_items, self.window) 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() pane1 = gtk.HPaned()
pane2 = gtk.HPaned() pane2 = gtk.HPaned()
pane1.pack2(pane2, gtk.TRUE, gtk.FALSE) pane1.pack2(pane2, True, False)
scroll1 = gtk.ScrolledWindow() scroll1 = gtk.ScrolledWindow()
scroll1.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) 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 = gtk.ScrolledWindow()
scroll2.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) 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 = gtk.ScrolledWindow()
scroll3.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) 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) self.session_model = gtk.ListStore(gobject.TYPE_STRING)
view1 = gtk.TreeView(self.session_model) view1 = gtk.TreeView(self.session_model)
@ -805,10 +806,10 @@ class ArdourShareWindow(object):
self.snap_selection.connect("changed", self.cb_snap_selection_changed) self.snap_selection.connect("changed", self.cb_snap_selection_changed)
scroll3.add(view3) scroll3.add(view3)
main_box.pack_start(pane1, gtk.TRUE, gtk.TRUE) main_box.pack_start(pane1, True, True)
self.status_bar = gtk.Statusbar() 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_cid = self.status_bar.get_context_id('display')
self._status_mid = '' self._status_mid = ''