/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "wx/wx_signal_manager.h"
#include "lib/util.h"
#include "lib/encoded_log_entry.h"
-#include "lib/server.h"
+#include "lib/encode_server.h"
#include "lib/config.h"
#include "lib/log.h"
#include "lib/raw_convert.h"
ID_timer
};
-static int const log_lines = 32;
+static unsigned int const log_lines = 32;
class ServerLog : public Log, public Signaller
{
public:
StatusDialog ()
: wxDialog (
- 0, wxID_ANY, _("DCP-o-matic encode server"),
+ 0, wxID_ANY, _("DCP-o-matic Encode Server"),
wxDefaultPosition, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
)
icon.CopyFromBitmap (bitmap);
#endif
- SetIcon (icon, std_to_wx ("DCP-o-matic encode server"));
+ SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status);
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit);
void main_thread ()
try {
- Server server (server_log, false);
- server.run (Config::instance()->num_local_encoding_threads ());
+ EncodeServer server (server_log, false, Config::instance()->num_local_encoding_threads());
+ server.run ();
} catch (...) {
store_current ();
}