Remove swaroop variant.

[dcpomatic.git] / src / wx / config_dialog.cc

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 40bb4340761c432fb6a13cb61a5ff00845852e25..2319754f04827aa51a196f8e3c76705d1d1ec5db 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -886,11 +886,7 @@ SoundPage::setup ()
                        if (dev.probed && dev.outputChannels > 0) {
                                _sound_output->Append (std_to_wx (dev.name));
                        }
-#ifdef DCPOMATIC_USE_RTERROR
-               } catch (RtError&) {
-#else
                } catch (RtAudioError&) {
-#endif
                        /* Something went wrong so let's just ignore that device */
                }
        }
@@ -927,11 +923,7 @@ SoundPage::sound_output_changed ()
        string default_device;
        try {
                default_device = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
-#ifdef DCPOMATIC_USE_RTERROR
-       } catch (RtError&) {
-#else
        } catch (RtAudioError&) {
-#endif
                /* Never mind */
        }
        if (!so || *so == default_device) {
@@ -958,11 +950,7 @@ SoundPage::config_changed ()
                RtAudio audio (DCPOMATIC_RTAUDIO_API);
                try {
                        configured_so = audio.getDeviceInfo(audio.getDefaultOutputDevice()).name;
-#ifdef DCPOMATIC_USE_RTERROR
-               } catch (RtError&) {
-#else
                } catch (RtAudioError&) {
-#endif
                        /* Probably no audio devices at all */
                }
        }
@@ -1000,11 +988,7 @@ SoundPage::config_changed ()
                                if (info.name == *configured_so && info.outputChannels > 0) {
                                        channels = info.outputChannels;
                                }
-#ifdef DCPOMATIC_USE_RTERROR
-                       } catch (RtError&) {
-#else
                        } catch (RtAudioError&) {
-#endif
                                /* Never mind */
                        }
                }
@@ -1093,19 +1077,9 @@ LocationsPage::setup ()
        table->Add (_kdm_directory, wxGBPosition (r, 1));
        ++r;
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0));
-       _background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true, false);
-       table->Add (_background_image, wxGBPosition (r, 1));
-       ++r;
-#endif
-
        _content_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::content_directory_changed, this));
        _playlist_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::playlist_directory_changed, this));
        _kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::kdm_directory_changed, this));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       _background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&LocationsPage::background_image_changed, this));
-#endif
 }
 
 void
@@ -1122,11 +1096,6 @@ LocationsPage::config_changed ()
        if (config->player_kdm_directory()) {
                checked_set (_kdm_directory, *config->player_kdm_directory());
        }
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       if (config->player_background_image()) {
-               checked_set (_background_image, *config->player_background_image());
-       }
-#endif
 }
 
 void
@@ -1146,20 +1115,3 @@ LocationsPage::kdm_directory_changed ()
 {
        Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath()));
 }
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-void
-LocationsPage::background_image_changed ()
-{
-       boost::filesystem::path const f = wx_to_std(_background_image->GetPath());
-       if (!boost::filesystem::is_regular_file(f) || !wxImage::CanRead(std_to_wx(f.string()))) {
-               error_dialog (0, _("Could not load image file."));
-               if (Config::instance()->player_background_image()) {
-                       checked_set (_background_image, *Config::instance()->player_background_image());
-               }
-               return;
-       }
-
-       Config::instance()->set_player_background_image(f);
-}
-#endif