Splash behaviour does not need to be branded after all.

diff --git a/src/lib/variant.cc b/src/lib/variant.cc
index 829a7d6e673c7e33e56c439b5cf8c72b22e8149a..f1c2af17bddfc8b1eca41d783676b1cd33f458dc 100644 (file)
--- a/src/lib/variant.cc
+++ b/src/lib/variant.cc
@@ -38,7 +38,6 @@ static char const* _dcpomatic_batch_converter = "DCP-o-matic Batch Converter";
 
 static char const* _report_problem_email = "carl@dcpomatic.com";
 
-static bool const _show_splash = true;
 static bool const _show_tagline = true;
 static bool const _show_dcpomatic_website = true;
 
@@ -139,12 +138,6 @@ variant::dcpomatic_player_app()
        return _dcpomatic_player_app;
 }
 
-bool
-variant::show_splash()
-{
-       return _show_splash;
-}
-
 bool
 variant::show_tagline()
 {

diff --git a/src/lib/variant.h b/src/lib/variant.h
index 9bcbb234e3b976a4df267c9db92b660f6f8be54f..87fbaa84d314da591fba1abf549f5fd523db248d 100644 (file)
--- a/src/lib/variant.h
+++ b/src/lib/variant.h
@@ -46,7 +46,6 @@ std::string dcpomatic_player_app();
 
 std::string report_problem_email();
 
-bool show_splash();
 bool show_tagline();
 bool show_dcpomatic_website();
 

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 9a8d9016298c8a012c8a089f884d39e159141c0e..7d8fb0a76cbfd77e9adbecc276bd786b01eb7920 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -604,10 +604,6 @@ setup_audio_channels_choice (wxChoice* choice, int minimum)
 wxSplashScreen*
 maybe_show_splash ()
 {
-       if (!variant::show_splash()) {
-               return nullptr;
-       }
-
        wxSplashScreen* splash = nullptr;
 
        try {