Merge master; fix destruction of Server; some test cleanups.

diff --git a/ChangeLog b/ChangeLog
index 3194262ef06886fa797af33075cf0ad15cf0948f..28cd9b332436f39c1d417a90c2b2a973fbd2fa1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 
        * Add subtitle view.
 
+2014-06-18  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.29 released.
+
+2014-06-18  Carl Hetherington  <cth@carlh.net>
+
+       * Fix thinko causing incorrect audio sample rates in some cases.
+
+2014-06-15  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.28 released.
+
 2014-06-12  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.69.27 released.

diff --git a/debian/changelog b/debian/changelog
index 41c9652c50033e6c69b580313c6da91460ddc8a6..fdd0cc20d7bfabb7a23450026b08b0f83635c17e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.69.27-1) UNRELEASED; urgency=low
+dcpomatic (1.69.29-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -151,8 +151,10 @@ dcpomatic (1.69.27-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 12 Jun 2014 16:51:24 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 18 Jun 2014 13:31:03 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/lib/config.h b/src/lib/config.h
index f0d2630d0c893b22edf39c7a041d52e5d30ba2f4..d82f520469c258f64b80b27d640a507f0503a962 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -31,7 +31,6 @@
 #include <dcp/metadata.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
-#include "server.h"
 
 class ServerDescription;
 class Scaler;

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index ac1d74c57b39af3aa449e43fd628651108701823..678cdf04eae219bbcd8218765ff0d11facab3725 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -38,6 +38,7 @@ extern "C" {
 #include "util.h"
 #include "config.h"
 #include "cross.h"
+#include "exceptions.h"
 
 class Image;
 class AudioBuffers;

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 8909240dc334e3d793e2ff64cc7d8b4922c8a1f1..acaedf0505d746b71661d89581192f7ef52d86ec 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -20,11 +20,11 @@
 #include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
-#include "config.h"
 #include "compose.hpp"
 #include "film.h"
 #include "job.h"
 #include "frame_rate_change.h"
+#include "exceptions.h"
 
 #include "i18n.h"
 

diff --git a/src/lib/server.cc b/src/lib/server.cc
index 59364fadd65aba787d1bfac5579c581eeba9a4c2..66ee2b0e3cf2ca93eeb7512a03763c2598836dcc 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -66,12 +66,33 @@ using dcp::Size;
 using dcp::raw_convert;
 
 Server::Server (shared_ptr<Log> log, bool verbose)
-       : _log (log)
+       : _terminate (false)
+       , _log (log)
        , _verbose (verbose)
+       , _acceptor (_io_service, boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base()))
 {
 
 }
 
+Server::~Server ()
+{
+       {
+               boost::mutex::scoped_lock lm (_worker_mutex);
+               _terminate = true;
+               _worker_condition.notify_all ();
+       }
+
+       for (vector<boost::thread*>::iterator i = _worker_threads.begin(); i != _worker_threads.end(); ++i) {
+               (*i)->join ();
+               delete *i;
+       }
+
+       _io_service.stop ();
+
+       _broadcast.io_service.stop ();
+       _broadcast.thread->join ();
+}
+
 /** @param after_read Filled in with gettimeofday() after reading the input from the network.
  *  @param after_encode Filled in with gettimeofday() after encoding the image.
  */
@@ -117,10 +138,14 @@ Server::worker_thread ()
 {
        while (1) {
                boost::mutex::scoped_lock lock (_worker_mutex);
-               while (_queue.empty ()) {
+               while (_queue.empty () && !_terminate) {
                        _worker_condition.wait (lock);
                }
 
+               if (_terminate) {
+                       return;
+               }
+
                shared_ptr<Socket> socket = _queue.front ();
                _queue.pop_front ();
                
@@ -187,39 +212,18 @@ Server::run (int num_threads)
 
        _broadcast.thread = new thread (bind (&Server::broadcast_thread, this));
        
-       boost::asio::io_service io_service;
-
-       boost::asio::ip::tcp::acceptor acceptor (
-               io_service,
-               boost::asio::ip::tcp::endpoint (boost::asio::ip::tcp::v4(), Config::instance()->server_port_base ())
-               );
-       
-       while (1) {
-               shared_ptr<Socket> socket (new Socket);
-               acceptor.accept (socket->socket ());
-
-               boost::mutex::scoped_lock lock (_worker_mutex);
-               
-               /* Wait until the queue has gone down a bit */
-               while (int (_queue.size()) >= num_threads * 2) {
-                       _worker_condition.wait (lock);
-               }
-               
-               _queue.push_back (socket);
-               _worker_condition.notify_all ();
-       }
+       start_accept ();
+       _io_service.run ();
 }
 
 void
 Server::broadcast_thread ()
 try
 {
-       boost::asio::io_service io_service;
-
        boost::asio::ip::address address = boost::asio::ip::address_v4::any ();
        boost::asio::ip::udp::endpoint listen_endpoint (address, Config::instance()->server_port_base() + 1);
 
-       _broadcast.socket = new boost::asio::ip::udp::socket (io_service);
+       _broadcast.socket = new boost::asio::ip::udp::socket (_broadcast.io_service);
        _broadcast.socket->open (listen_endpoint.protocol ());
        _broadcast.socket->bind (listen_endpoint);
 
@@ -229,7 +233,7 @@ try
                boost::bind (&Server::broadcast_received, this)
                );
 
-       io_service.run ();
+       _broadcast.io_service.run ();
 }
 catch (...)
 {
@@ -264,3 +268,35 @@ Server::broadcast_received ()
                _broadcast.send_endpoint, boost::bind (&Server::broadcast_received, this)
                );
 }
+
+void
+Server::start_accept ()
+{
+       if (_terminate) {
+               return;
+       }
+
+       shared_ptr<Socket> socket (new Socket);
+       _acceptor.async_accept (socket->socket (), boost::bind (&Server::handle_accept, this, socket, boost::asio::placeholders::error));
+}
+
+void
+Server::handle_accept (shared_ptr<Socket> socket, boost::system::error_code const & error)
+{
+       if (error) {
+               return;
+       }
+
+       boost::mutex::scoped_lock lock (_worker_mutex);
+       
+       /* Wait until the queue has gone down a bit */
+       while (_queue.size() >= _worker_threads.size() * 2 && !_terminate) {
+               _worker_condition.wait (lock);
+       }
+       
+       _queue.push_back (socket);
+       _worker_condition.notify_all ();
+
+       start_accept ();
+}
+       

diff --git a/src/lib/server.h b/src/lib/server.h
index a9b4b1c1c8982ed9d57c615c9cee6fcfd9df0324..9f3e99f9cbe577c20c7c07bedccbe0d7298f8c07 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -90,6 +90,7 @@ class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
        Server (boost::shared_ptr<Log> log, bool verbose);
+       ~Server ();
 
        void run (int num_threads);
 
@@ -98,14 +99,24 @@ private:
        int process (boost::shared_ptr<Socket> socket, struct timeval &, struct timeval &);
        void broadcast_thread ();
        void broadcast_received ();
+       void start_accept ();
+       void handle_accept (boost::shared_ptr<Socket>, boost::system::error_code const &);
+
+       bool _terminate;
 
        std::vector<boost::thread *> _worker_threads;
        std::list<boost::shared_ptr<Socket> > _queue;
        boost::mutex _worker_mutex;
        boost::condition _worker_condition;
+       
        boost::shared_ptr<Log> _log;
        bool _verbose;
 
+       boost::asio::io_service _io_service;
+       boost::asio::ip::tcp::acceptor _acceptor;
+
+       int _num_threads;
+
        struct Broadcast {
 
                Broadcast ()
@@ -117,6 +128,7 @@ private:
                boost::asio::ip::udp::socket* socket;
                char buffer[64];
                boost::asio::ip::udp::endpoint send_endpoint;
+               boost::asio::io_service io_service;
                
        } _broadcast;
 };

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index bd4a39811e158e235d34a62a8f836efb28ed6ab9..dd80e94cb68ff272f46177847fb18c37d8b5e246 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -159,6 +159,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Mike Blakesley"));
        tested_by.Add (wxT ("David Booty"));
        tested_by.Add (wxT ("Roop Chand"));
+       tested_by.Add (wxT ("Daniel Chauvet"));
        tested_by.Add (wxT ("Adam Colt"));
        tested_by.Add (wxT ("John Convertino"));
        tested_by.Add (wxT ("Andreas Eli"));

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index c65eadd5a0676c9122ee968b8f902fe774a399ff..8e92400bdb956ffd7b58205dccf5626bf9015be7 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -25,6 +25,7 @@
 #include <wx/renderer.h>
 #include <wx/grid.h>
 #include <dcp/types.h>
+#include <dcp/raw_convert.h>
 #include "lib/audio_mapping.h"
 #include "lib/util.h"
 #include "audio_mapping_view.h"
@@ -246,7 +247,7 @@ AudioMappingView::update_cells ()
                _grid->SetCellValue (i, 0, wxString::Format (wxT("%d"), i + 1));
 
                for (int j = 1; j < _grid->GetNumberCols(); ++j) {
-                       _grid->SetCellValue (i, j, std_to_wx (lexical_cast<string> (_map.get (i, static_cast<dcp::Channel> (j - 1)))));
+                       _grid->SetCellValue (i, j, std_to_wx (dcp::raw_convert<string> (_map.get (i, static_cast<dcp::Channel> (j - 1)))));
                }
        }
 

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 68fbc3f1b391b05a0bc1d97de2a42282254e817a..b447e0eee9a57328f76541993b44c498ef785060 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -35,6 +35,7 @@
 #include "lib/filter.h"
 #include "lib/dcp_content_type.h"
 #include "lib/colour_conversion.h"
+#include "lib/log.h"
 #include "config_dialog.h"
 #include "wx_util.h"
 #include "editable_list.h"

diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 1816de8e693df8a1a4fac0bf29e324a12efede53..51594a47acbd930347ded076aad887dadd9d8203 100644 (file)
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -130,6 +130,8 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb)
        for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
                delete *i;
        }
+
+       delete server;
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test_yuv)
@@ -209,5 +211,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv)
        for (list<thread*>::iterator i = threads.begin(); i != threads.end(); ++i) {
                delete *i;
        }
+
+       delete server;
 }
 

diff --git a/test/player_test.cc b/test/player_test.cc
index 2412fc31299799411ed60608a33395886cad26f3..d480602422b0ee1a810cfc74a1e38c0ad575eb1b 100644 (file)
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
        film->examine_and_add_content (C);
        wait_for_jobs ();
 
-       BOOST_CHECK_EQUAL (A->full_length(), DCPTime::from_seconds (3));
+       BOOST_CHECK_EQUAL (A->full_length(), DCPTime (280000));
 
        A->set_position (DCPTime::from_seconds (0));
        B->set_position (DCPTime::from_seconds (10));

diff --git a/test/recover_test.cc b/test/recover_test.cc
index bf07811ddce917a3b73d4c9a76888bfe37ba062c..c9a5932418252ab6246467fc8c2749483b43e8d9 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (recover_test)
        film->make_dcp ();
        wait_for_jobs ();
 
-       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_3651eded785682b85f4baca4b1d3b7a9_24_bicubic_200000000_P_S_3D.mxf";
+       boost::filesystem::path const video = "build/test/recover_test/video/185_2K_e8efb95857b62aa6ff94e3d669e75776_24_bicubic_100000000_P_S_3D.mxf";
 
        boost::filesystem::copy_file (
                video,

diff --git a/test/test.cc b/test/test.cc
index 1d8041656cf05e2acaf76081e327c00f7621661b..32f74a7d2fb62b8243056d11c11b84eeb5eea0b1 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -143,7 +143,7 @@ check_file (boost::filesystem::path ref, boost::filesystem::path check)
 static void
 note (dcp::NoteType t, string n)
 {
-       if (t == dcp::ERROR) {
+       if (t == dcp::DCP_ERROR) {
                cerr << n << "\n";
        }
 }