diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-25 13:44:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-25 13:44:21 +0000 |
| commit | a76d015b8b13c382e1a57e2ac604317ada1dbdc2 (patch) | |
| tree | e001525beb8283494b314b9a90c6e0d5c2d6bf9a | |
| parent | ac61c228eba8dec7e81498b47013196681ca7ce8 (diff) | |
make session exchange run again
git-svn-id: svn://localhost/ardour2/trunk@1744 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 1 | ||||
| -rwxr-xr-x | tools/session_exchange.py | 25 |
2 files changed, 13 insertions, 13 deletions
diff --git a/SConstruct b/SConstruct index b6e3cfb813..edbb2d9274 100644 --- a/SConstruct +++ b/SConstruct @@ -1108,7 +1108,6 @@ env.Distribute (env['DISTTREE'], [ 'SConstruct', 'svn_revision.h', 'COPYING', 'PACKAGER_README', 'README', 'ardour.rc.in', - 'ardour_system.rc', 'tools/config.guess', 'icons/icon/ardour_icon_mac_mask.png', 'icons/icon/ardour_icon_mac.png', diff --git a/tools/session_exchange.py b/tools/session_exchange.py index 1dc9e836aa..9ba266e970 100755 --- a/tools/session_exchange.py +++ b/tools/session_exchange.py @@ -130,7 +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'] = [] - 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 @@ -152,10 +155,8 @@ class Data(object): def create_session(self, session_path): try: os.mkdir(session_path) - if v2paths: - os.mkdir(os.path.join (session_path,'interchange',session_name,'audiofiles') - else: - os.mkdir(os.path.join (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 @@ -763,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) @@ -805,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 = '' |