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

support for 16 bit native files, part II

Browse source 
git-svn-id: svn://localhost/ardour2/trunk@2134 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-07-16 22:06:35 +00:00
parent 323438965e
commit 37c74810d2
6 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/automation_event.h
View file

@ -50,9 +50,9 @@ struct ControlEvent {
coeff[0] = coeff[1] = coeff[2] = coeff[3] = 0.0; coeff[0] = coeff[1] = coeff[2] = coeff[3] = 0.0;
} }
double when; double when;
double value; double value;
double coeff[4]; ///< Used by Curve double coeff[4]; ///< Used by Curve
}; };

3
libs/ardour/ardour/types.h
View file

@ -325,7 +325,8 @@ namespace ARDOUR {
enum SampleFormat { enum SampleFormat {
FormatFloat = 0, FormatFloat = 0,
FormatInt24 FormatInt24,
FormatInt16
}; };

2
libs/ardour/automation_event.cc
View file

@ -379,7 +379,7 @@ AutomationList::rt_add (double when, double value)
} }
} }
} }
if (!done) { if (!done) {
_rt_insertion_point = _events.insert (where, new ControlEvent (when, value)); _rt_insertion_point = _events.insert (where, new ControlEvent (when, value));
} }

1
libs/ardour/enums.cc
View file

@ -204,6 +204,7 @@ setup_enum_writer ()
REGISTER_ENUM (FormatFloat); REGISTER_ENUM (FormatFloat);
REGISTER_ENUM (FormatInt24); REGISTER_ENUM (FormatInt24);
REGISTER_ENUM (FormatInt16);
REGISTER (_SampleFormat); REGISTER (_SampleFormat);
REGISTER_ENUM (BWF); REGISTER_ENUM (BWF);

4
libs/ardour/session.cc
View file

@ -3599,6 +3599,10 @@ Session::available_capture_duration ()
sample_bytes_on_disk = 3.0; sample_bytes_on_disk = 3.0;
break; break;
case FormatInt16:
sample_bytes_on_disk = 2.0;
break;
default: default:
/* impossible, but keep some gcc versions happy */ /* impossible, but keep some gcc versions happy */
fatal << string_compose (_("programming error: %1"), fatal << string_compose (_("programming error: %1"),

4
libs/ardour/sndfilesource.cc
View file

@ -122,6 +122,10 @@ SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, Heade
case FormatInt24: case FormatInt24:
fmt |= SF_FORMAT_PCM_24; fmt |= SF_FORMAT_PCM_24;
break; break;
case FormatInt16:
fmt |= SF_FORMAT_PCM_16;
break;
} }
_info.channels = 1; _info.channels = 1;