diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-25 13:20:09 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-25 13:20:09 +0000 |
commit | ac61c228eba8dec7e81498b47013196681ca7ce8 (patch) | |
tree | 67350a58b081fc724c07baae60bb1b7d4166ad67 | |
parent | 1dc08128787df959e639fd7448e56779e49de1a6 (diff) |
remove debugging message
git-svn-id: svn://localhost/ardour2/trunk@1743 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | ardour_system.rc | 44 | ||||
-rw-r--r-- | libs/ardour/session_command.cc | 2 | ||||
-rwxr-xr-x | tools/session_exchange.py | 12 |
4 files changed, 11 insertions, 49 deletions
diff --git a/SConstruct b/SConstruct index da2c6111cc..b6e3cfb813 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.0rc1' +ardour_version = '2.0rc2' subst_dict = { } diff --git a/ardour_system.rc b/ardour_system.rc deleted file mode 100644 index 77ffd5bb34..0000000000 --- a/ardour_system.rc +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Ardour> - <MIDI-port tag="seq" device="ardour" type="alsa/sequencer" mode="duplex"/> - <MIDI-port tag="control" device="ardour" type="alsa/sequencer" mode="duplex"/> - <MIDI-port tag="mcu" device="ardour" type="alsa/sequencer" mode="duplex"/> - <Config> - <Option name="minimum-disk-io-bytes" value="262144"/> - <Option name="track-buffer-seconds" value="5.000000"/> - <Option name="mute-affects-pre-fader" value="yes"/> - <Option name="mute-affects-post-fader" value="yes"/> - <Option name="mute-affects-control-outs" value="yes"/> - <Option name="mute-affects-main-outs" value="yes"/> - <Option name="solo-latch" value="yes"/> - <Option name="mtc-port" value="seq"/> - <Option name="mmc-port" value="seq"/> - <Option name="midi-port" value="seq"/> - <Option name="jack-time-master" value="yes"/> - <Option name="trace-midi-input" value="no"/> - <Option name="trace-midi-output" value="no"/> - <Option name="plugins-stop-with-transport" value="no"/> - <Option name="no-sw-monitoring" value="no"/> - <Option name="stop-recording-on-xrun" value="no"/> - <Option name="stop-at-session-end" value="no"/> - <Option name="auto-xfade" value="yes"/> - <Option name="crossfades-active" value="1"/> - <Option name="crossfades-visible" value="1"/> - <Option name="xfade-model" value="0"/> - <Option name="no-new-session-dialog" value="yes"/> - <Option name="timecode-source-is-synced" value="yes"/> - <Option name="auditioner-left-out" value="alsa_pcm:playback_1"/> - <Option name="auditioner-right-out" value="alsa_pcm:playback_2"/> - <Option name="quieten-at-speed" value="1.000000"/> - <Option name="use-vst" value="yes"/> - <Option name="use-tranzport" value="yes"/> - <Option name="disk-choice-space-threshold" value="57600000"/> - <Option name="destructive-xfade-msecs" value="20"/> - <Option name="periodic-safety-backups" value="1"/> - <Option name="periodic-safety-backup-interval" value="120"/> - </Config> - <extra> - <Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/> - </extra> -</Ardour> - diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc index d7fc80aa4b..b9a0e2cb60 100644 --- a/libs/ardour/session_command.cc +++ b/libs/ardour/session_command.cc @@ -81,8 +81,6 @@ Session::memento_command_factory(XMLNode *n) if (obj_T == typeid (AudioRegion).name() || obj_T == typeid (Region).name()) { if (audio_regions.count(id)) { return new MementoCommand<AudioRegion>(*audio_regions[id], before, after); - } else { - cerr << "count failed for " << id << " though we have " << audio_regions.size() << endl; } } else if (obj_T == typeid (AudioSource).name()) { if (audio_sources.count(id)) diff --git a/tools/session_exchange.py b/tools/session_exchange.py index 825476c967..1dc9e836aa 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,7 @@ 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')) self._data['sessions'] = sessions @@ -150,7 +152,10 @@ class Data(object): def create_session(self, session_path): try: os.mkdir(session_path) - os.mkdir(session_path+"/sounds") + if v2paths: + os.mkdir(os.path.join (session_path,'interchange',session_name,'audiofiles') + else: + os.mkdir(os.path.join (session_path,'sounds') except OSError: raise_error("Could not create session directory", g_display.window) return @@ -230,7 +235,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): |