summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-09 13:44:10 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-09 13:45:12 +0100
commitaeb835a18c8df347e0ed68fb24631b320abeb611 (patch)
tree01746a2d872aad8127a1442326ac720756172a17 /src/wx
parent4d9f56686380aed5eb3e17ab9e720df57a17f079 (diff)
Logging improvements to allow prettier displays in the server GUI.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/config_dialog.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 722fa59ce..f3dbaf6d9 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1357,12 +1357,12 @@ private:
checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
checked_set (_only_servers_encode, config->only_servers_encode ());
- checked_set (_log_general, config->log_types() & Log::TYPE_GENERAL);
- checked_set (_log_warning, config->log_types() & Log::TYPE_WARNING);
- checked_set (_log_error, config->log_types() & Log::TYPE_ERROR);
- checked_set (_log_timing, config->log_types() & Log::TYPE_TIMING);
- checked_set (_log_debug_decode, config->log_types() & Log::TYPE_DEBUG_DECODE);
- checked_set (_log_debug_encode, config->log_types() & Log::TYPE_DEBUG_ENCODE);
+ checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
+ 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_decode, config->log_types() & LogEntry::TYPE_DEBUG_DECODE);
+ checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
#ifdef DCPOMATIC_WINDOWS
checked_set (_win32_console, config->win32_console());
#endif
@@ -1387,22 +1387,22 @@ private:
{
int types = 0;
if (_log_general->GetValue ()) {
- types |= Log::TYPE_GENERAL;
+ types |= LogEntry::TYPE_GENERAL;
}
if (_log_warning->GetValue ()) {
- types |= Log::TYPE_WARNING;
+ types |= LogEntry::TYPE_WARNING;
}
if (_log_error->GetValue ()) {
- types |= Log::TYPE_ERROR;
+ types |= LogEntry::TYPE_ERROR;
}
if (_log_timing->GetValue ()) {
- types |= Log::TYPE_TIMING;
+ types |= LogEntry::TYPE_TIMING;
}
if (_log_debug_decode->GetValue ()) {
- types |= Log::TYPE_DEBUG_DECODE;
+ types |= LogEntry::TYPE_DEBUG_DECODE;
}
if (_log_debug_encode->GetValue ()) {
- types |= Log::TYPE_DEBUG_ENCODE;
+ types |= LogEntry::TYPE_DEBUG_ENCODE;
}
Config::instance()->set_log_types (types);
}