Logging improvements to allow prettier displays in the server GUI.

[dcpomatic.git] / src / lib / sndfile_decoder.cc

diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index 602014d5883d2dba1381588bb44a7036debc9c96..49633dd1fad2e503b345bf078fa4c56e454b52c1 100644 (file)
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-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
@@ -18,10 +18,6 @@
 */
 
 #include <iostream>
-#ifdef DCPOMATIC_WINDOWS
-#include <windows.h>
-#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
-#endif
 #include <sndfile.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
@@ -36,31 +32,18 @@ using std::min;
 using std::cout;
 using boost::shared_ptr;
 
-SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c)
-       : AudioDecoder (c)
-       , _sndfile_content (c)
+SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c, bool fast)
+       : Sndfile (c)
+       , AudioDecoder (c, fast)
+       , _done (0)
+       , _remaining (_info.frames)
        , _deinterleave_buffer (0)
 {
-       _info.format = 0;
-
-       /* Here be monsters.  See fopen_boost for similar shenanigans */
-#ifdef DCPOMATIC_WINDOWS
-       _sndfile = sf_wchar_open (_sndfile_content->path(0).c_str(), SFM_READ, &_info);
-#else  
-       _sndfile = sf_open (_sndfile_content->path(0).string().c_str(), SFM_READ, &_info);
-#endif
-       
-       if (!_sndfile) {
-               throw DecodeError (_("could not open audio file for reading"));
-       }
 
-       _done = 0;
-       _remaining = _info.frames;
 }
 
 SndfileDecoder::~SndfileDecoder ()
 {
-       sf_close (_sndfile);
        delete[] _deinterleave_buffer;
 }
 
@@ -70,18 +53,18 @@ SndfileDecoder::pass ()
        if (_remaining == 0) {
                return true;
        }
-       
+
        /* Do things in half second blocks as I think there may be limits
           to what FFmpeg (and in particular the resampler) can cope with.
        */
-       sf_count_t const block = _sndfile_content->audio_frame_rate() / 2;
+       sf_count_t const block = _sndfile_content->audio_stream()->frame_rate() / 2;
        sf_count_t const this_time = min (block, _remaining);
 
-       int const channels = _sndfile_content->audio_channels ();
-       
+       int const channels = _sndfile_content->audio_stream()->channels ();
+
        shared_ptr<AudioBuffers> data (new AudioBuffers (channels, this_time));
 
-       if (_sndfile_content->audio_channels() == 1) {
+       if (_sndfile_content->audio_stream()->channels() == 1) {
                /* No de-interleaving required */
                sf_read_float (_sndfile, data->data(0), this_time);
        } else {
@@ -101,38 +84,20 @@ SndfileDecoder::pass ()
                        }
                }
        }
-               
+
        data->set_frames (this_time);
-       audio (data, ContentTime::from_frames (_done, audio_frame_rate ()));
+       audio (_sndfile_content->audio_stream (), data, ContentTime::from_frames (_done, _info.samplerate));
        _done += this_time;
        _remaining -= this_time;
 
        return _remaining == 0;
 }
 
-int
-SndfileDecoder::audio_channels () const
-{
-       return _info.channels;
-}
-
-ContentTime
-SndfileDecoder::audio_length () const
-{
-       return ContentTime::from_frames (_info.frames, audio_frame_rate ());
-}
-
-int
-SndfileDecoder::audio_frame_rate () const
-{
-       return _info.samplerate;
-}
-
 void
 SndfileDecoder::seek (ContentTime t, bool accurate)
 {
        AudioDecoder::seek (t, accurate);
 
-       _done = t.frames (audio_frame_rate ());
+       _done = t.frames_round (_info.samplerate);
        _remaining = _info.frames - _done;
 }