summaryrefslogtreecommitdiff
path: root/src/lib/audio_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-03 22:58:46 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-03 22:58:46 +0100
commit82926443230084739cb673a83b2ab1f9d733a07b (patch)
tree72ff6a2564bc5950f52730b9d00151a5ebbbe00f /src/lib/audio_content.h
parent5ff10668facca32723efae3f08dfaab8a3d8bd44 (diff)
All audio content should resample if the output frame rate and content
frame rates differ; make Sndfile sources use the video-frame-rate-based calculation for output frame rate (like FFmpeg sources do). Also, fix small problems when flushing Resamplers used to get fed back to Resamplers again.
Diffstat (limited to 'src/lib/audio_content.h')
-rw-r--r--src/lib/audio_content.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index d30db02d7..2a1216d86 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -54,11 +54,12 @@ public:
virtual int audio_channels () const = 0;
virtual AudioContent::Frame audio_length () const = 0;
virtual int content_audio_frame_rate () const = 0;
- virtual int output_audio_frame_rate () const = 0;
virtual AudioMapping audio_mapping () const = 0;
virtual void set_audio_mapping (AudioMapping) = 0;
virtual boost::filesystem::path audio_analysis_path () const;
+ int output_audio_frame_rate () const;
+
boost::signals2::connection analyse_audio (boost::function<void()>);
void set_audio_gain (float);