summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/types.h3
-rw-r--r--libs/ardour/enums.cc1
-rw-r--r--libs/ardour/session.cc4
-rw-r--r--libs/ardour/sndfilesource.cc4
4 files changed, 11 insertions, 1 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 182172dff6..397575f087 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -315,7 +315,8 @@ namespace ARDOUR {
enum SampleFormat {
FormatFloat = 0,
- FormatInt24
+ FormatInt24,
+ FormatInt16
};
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 5a4ee251b6..068aec654d 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -193,6 +193,7 @@ setup_enum_writer ()
REGISTER_ENUM (FormatFloat);
REGISTER_ENUM (FormatInt24);
+ REGISTER_ENUM (FormatInt16);
REGISTER (_SampleFormat);
REGISTER_ENUM (BWF);
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 687fad4fec..0af1272c0a 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -3529,6 +3529,10 @@ Session::available_capture_duration ()
sample_bytes_on_disk = 3.0;
break;
+ case FormatInt16:
+ sample_bytes_on_disk = 2.0;
+ break;
+
default:
/* impossible, but keep some gcc versions happy */
fatal << string_compose (_("programming error: %1"),
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 24647030ab..ed1378a723 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -122,6 +122,10 @@ SndFileSource::SndFileSource (Session& s, ustring path, SampleFormat sfmt, Heade
case FormatInt24:
fmt |= SF_FORMAT_PCM_24;
break;
+
+ case FormatInt16:
+ fmt |= SF_FORMAT_PCM_16;
+ break;
}
_info.channels = 1;