projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename debug type THREED to THREED_D.
[dcpomatic.git]
/
src
/
wx
/
full_config_dialog.cc
diff --git
a/src/wx/full_config_dialog.cc
b/src/wx/full_config_dialog.cc
index 2d4ac3fdf9f98c233772be37f20ebbf73e45015e..e17e0a57b1a3bad4a7915b1daf9c7588869f7d89 100644
(file)
--- a/
src/wx/full_config_dialog.cc
+++ b/
src/wx/full_config_dialog.cc
@@
-57,7
+57,6
@@
#include <wx/filepicker.h>
#include <RtAudio.h>
#include <boost/filesystem.hpp>
#include <wx/filepicker.h>
#include <RtAudio.h>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
using std::vector;
#include <iostream>
using std::vector;
@@
-68,7
+67,7
@@
using std::pair;
using std::make_pair;
using std::map;
using boost::bind;
using std::make_pair;
using std::map;
using boost::bind;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::function;
using boost::optional;
#if BOOST_VERSION >= 106100
using boost::function;
using boost::optional;
#if BOOST_VERSION >= 106100
@@
-92,11
+91,6
@@
private:
int r = 0;
add_language_controls (table, r);
int r = 0;
add_language_controls (table, r);
- add_label_to_sizer (table, _panel, _("Interface complexity"), true, wxGBPosition(r, 0));
- _interface_complexity = new wxChoice (_panel, wxID_ANY);
- table->Add (_interface_complexity, wxGBPosition (r, 1));
- ++r;
-
add_label_to_sizer (table, _panel, _("Number of threads DCP-o-matic should use"), true, wxGBPosition (r, 0));
_master_encoding_threads = new wxSpinCtrl (_panel);
table->Add (_master_encoding_threads, wxGBPosition (r, 1));
add_label_to_sizer (table, _panel, _("Number of threads DCP-o-matic should use"), true, wxGBPosition (r, 0));
_master_encoding_threads = new wxSpinCtrl (_panel);
table->Add (_master_encoding_threads, wxGBPosition (r, 1));
@@
-134,10
+128,6
@@
private:
_config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed, this));
_cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed, this));
_config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed, this));
_cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed, this));
- _interface_complexity->Append (_("Simple"));
- _interface_complexity->Append (_("Full"));
- _interface_complexity->Bind (wxEVT_CHOICE, boost::bind(&FullGeneralPage::interface_complexity_changed, this));
-
_master_encoding_threads->SetRange (1, 128);
_master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this));
_server_encoding_threads->SetRange (1, 128);
_master_encoding_threads->SetRange (1, 128);
_master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this));
_server_encoding_threads->SetRange (1, 128);
@@
-154,14
+144,6
@@
private:
{
Config* config = Config::instance ();
{
Config* config = Config::instance ();
- switch (config->interface_complexity()) {
- case Config::INTERFACE_SIMPLE:
- checked_set (_interface_complexity, 0);
- break;
- case Config::INTERFACE_FULL:
- checked_set (_interface_complexity, 1);
- break;
- }
checked_set (_master_encoding_threads, config->master_encoding_threads ());
checked_set (_server_encoding_threads, config->server_encoding_threads ());
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
checked_set (_master_encoding_threads, config->master_encoding_threads ());
checked_set (_server_encoding_threads, config->server_encoding_threads ());
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
@@
-187,16
+169,6
@@
private:
d->Destroy ();
}
d->Destroy ();
}
- void interface_complexity_changed ()
- {
- if (_interface_complexity->GetSelection() == 0) {
- Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
- } else {
- Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
- }
- }
-
-
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
void analyse_ebur128_changed ()
{
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
void analyse_ebur128_changed ()
{
@@
-250,7
+222,6
@@
private:
Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
}
Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
}
- wxChoice* _interface_complexity;
wxSpinCtrl* _master_encoding_threads;
wxSpinCtrl* _server_encoding_threads;
FilePickerCtrl* _config_file;
wxSpinCtrl* _master_encoding_threads;
wxSpinCtrl* _server_encoding_threads;
FilePickerCtrl* _config_file;
@@
-359,13
+330,13
@@
private:
_isdcf_metadata_button->Bind (wxEVT_BUTTON, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this));
_isdcf_metadata_button->Bind (wxEVT_BUTTON, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this));
-
BOOST_FOREACH (Ratio const * i,
Ratio::containers()) {
+
for (auto i:
Ratio::containers()) {
_container->Append (std_to_wx(i->container_nickname()));
}
_container->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::container_changed, this));
_container->Append (std_to_wx(i->container_nickname()));
}
_container->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::container_changed, this));
-
BOOST_FOREACH (DCPContentType const * i,
DCPContentType::all()) {
+
for (auto i:
DCPContentType::all()) {
_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
}
_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
}
@@
-1481,7
+1452,7
@@
private:
checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR);
checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING);
checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR);
checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING);
- checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREED);
+ checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREE
_
D);
checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL);
checked_set (_log_debug_video_view, config->log_types() & LogEntry::TYPE_DEBUG_VIDEO_VIEW);
checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL);
checked_set (_log_debug_video_view, config->log_types() & LogEntry::TYPE_DEBUG_VIDEO_VIEW);
@@
-1558,7
+1529,7
@@
private:
types |= LogEntry::TYPE_TIMING;
}
if (_log_debug_threed->GetValue ()) {
types |= LogEntry::TYPE_TIMING;
}
if (_log_debug_threed->GetValue ()) {
- types |= LogEntry::TYPE_DEBUG_THREED;
+ types |= LogEntry::TYPE_DEBUG_THREE
_
D;
}
if (_log_debug_encode->GetValue ()) {
types |= LogEntry::TYPE_DEBUG_ENCODE;
}
if (_log_debug_encode->GetValue ()) {
types |= LogEntry::TYPE_DEBUG_ENCODE;