summaryrefslogtreecommitdiff
path: root/src/lib/single_stream_audio_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-27 02:09:22 +0100
committerCarl Hetherington <cth@carlh.net>2015-05-27 02:09:22 +0100
commit387304bc9147933b68eda2b38ba8cac0d250e87e (patch)
tree0697a08182c94193a3424d44d5f7af4231f0ade3 /src/lib/single_stream_audio_content.h
parentfd2b1840496fa121727b7e835843c8beeaebd5eb (diff)
Untested use of Frame for video/audio content lengths.
Diffstat (limited to 'src/lib/single_stream_audio_content.h')
-rw-r--r--src/lib/single_stream_audio_content.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/single_stream_audio_content.h b/src/lib/single_stream_audio_content.h
index fcfaf14ca..d1d512d67 100644
--- a/src/lib/single_stream_audio_content.h
+++ b/src/lib/single_stream_audio_content.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ public:
return _audio_channels;
}
- ContentTime audio_length () const {
+ Frame audio_length () const {
boost::mutex::scoped_lock lm (_mutex);
return _audio_length;
}
@@ -66,7 +66,7 @@ public:
protected:
int _audio_channels;
- ContentTime _audio_length;
+ Frame _audio_length;
int _audio_frame_rate;
AudioMapping _audio_mapping;
};