Merge master.

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index 8e65bbb5415cc236e496e56a83b92dbd45503082..58c2771b7cebd8e46b9d700c3218041abd3dadd4 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -131,15 +131,7 @@ private:
        int _timeout;
 };
 
-class LocaleGuard
-{
-public:
-       LocaleGuard ();
-       ~LocaleGuard ();
-       
-private:
-       char* _old;
-};
+extern int64_t video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, float frames_per_second);
 
 /** @class ScopedTemporary
  *  @brief A temporary file which is deleted when the ScopedTemporary object goes out of scope.