diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-28 19:22:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-03-28 19:22:29 +0000 |
| commit | e27ac3278b0d335be0ccd9d6d6373287d406adb5 (patch) | |
| tree | 3e0e812304a7652909f341b1a06b5bedb04a9cb2 /libs/ardour/session.cc | |
| parent | 744acb7c16806759743901190d8b38b61475d5be (diff) | |
a) fix problems with multichannel tape tracks
b) separate data format and header format for native audio files
c) expose data/header selections in GUI
d) fix error in file naming for multichannel tape tracks
e) remove blocks on GTK rc files during startup
git-svn-id: svn://localhost/trunk/ardour2@423 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index fd54981908..9b581ce790 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2795,7 +2795,7 @@ Session::audio_path_from_name (string name, uint32_t nchan, uint32_t chan, bool if (nchan < 2) { snprintf (buf, sizeof(buf), "%s/T%04d-%s.wav", spath.c_str(), cnt, legalized.c_str()); } else if (nchan == 2) { - if (nchan == 0) { + if (chan == 0) { snprintf (buf, sizeof(buf), "%s/T%04d-%s%%L.wav", spath.c_str(), cnt, legalized.c_str()); } else { snprintf (buf, sizeof(buf), "%s/T%04d-%s%%R.wav", spath.c_str(), cnt, legalized.c_str()); @@ -2871,9 +2871,9 @@ Session::create_file_source (DiskStream& ds, int32_t chan, bool destructive) /* this might throw failed_constructor(), which is OK */ if (destructive) { - return new DestructiveFileSource (spath, frame_rate()); + return new DestructiveFileSource (spath, frame_rate(), false, Config->get_native_file_data_format()); } else { - return new FileSource (spath, frame_rate()); + return new FileSource (spath, frame_rate(), false, Config->get_native_file_data_format()); } } @@ -3585,7 +3585,7 @@ Session::write_one_track (AudioTrack& track, jack_nframes_t start, jack_nframes_ } try { - fsource = new FileSource (buf, frame_rate()); + fsource = new FileSource (buf, frame_rate(), false, Config->get_native_file_data_format()); } catch (failed_constructor& err) { |