Some fixes and logs.

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index c6960d0d15bf0a8c158487fae716b23470b21c15..0d5fc1c6efbca6dd8a843a284b7dfde905d3959e 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -601,7 +601,6 @@ Encoder::writer_thread ()
                        _write_queue.pop_front ();
 
                        lock.unlock ();
-                       /* XXX: write to mxf */
                        _film->log()->log (String::compose ("Writer writes %1 to MXF", encoded.second));
                        if (encoded.first) {
                                _picture_asset_writer->write (encoded.first->data(), encoded.first->size());
@@ -619,7 +618,7 @@ Encoder::writer_thread ()
                           Put some to disk.
                        */
 
-                       pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.front ();
+                       pair<boost::shared_ptr<EncodedData>, int> encoded = _write_queue.back ();
                        _write_queue.pop_back ();
                        if (!encoded.first) {
                                /* This is a `repeat-last' frame, so no need to write it to disk */
@@ -627,7 +626,7 @@ Encoder::writer_thread ()
                        }
 
                        lock.unlock ();
-                       _film->log()->log (String::compose ("Writer full; pushes %1 to disk", encoded.second));
+                       _film->log()->log (String::compose ("Writer full (awaiting %1); pushes %2 to disk", _last_written_frame + 1, encoded.second));
                        encoded.first->write (_film, encoded.second);
                        lock.lock ();
 

diff --git a/src/lib/log.cc b/src/lib/log.cc
index 06cff04956b8b1a28fde9ff31c493def5a5930f7..7459700eacd43b783da9b61673866f8535c929b4 100644 (file)
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -28,7 +28,7 @@
 using namespace std;
 
 Log::Log ()
-       : _level (VERBOSE)
+       : _level (STANDARD)
 {
 
 }