diff options
| author | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-14 03:43:32 +0000 |
| commit | 50a3102b9b533d7f8786d220f8df67421b9227c8 (patch) | |
| tree | 669f84631ba1d9a1d312e3f76b226ca938c75c0f /libs/ardour/audiofilesource.cc | |
| parent | edd841895b873b14c4aa814a80de5dc20ff30618 (diff) | |
Merge big changes (mostly Controllable) from trunk
git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audiofilesource.cc')
| -rw-r--r-- | libs/ardour/audiofilesource.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 0663f5f9b1..87700cedb3 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -56,8 +56,7 @@ string AudioFileSource::peak_dir = ""; string AudioFileSource::search_path; sigc::signal<void> AudioFileSource::HeaderPositionOffsetChanged; -bool AudioFileSource::header_position_negative; -uint64_t AudioFileSource::header_position_offset; +uint64_t AudioFileSource::header_position_offset = 0; char AudioFileSource::bwf_country_code[3] = "US"; char AudioFileSource::bwf_organization_code[4] = "LAS"; @@ -592,11 +591,10 @@ AudioFileSource::set_search_path (string p) } void -AudioFileSource::set_header_position_offset (jack_nframes_t offset, bool negative) +AudioFileSource::set_header_position_offset (jack_nframes_t offset) { header_position_offset = offset; - header_position_negative = negative; - + cerr << "hpo set to " << offset << endl; HeaderPositionOffsetChanged (); } |