Tidying.

diff --git a/src/lib/content.cc b/src/lib/content.cc
index a56891689c201f2d23e1f8eec6c20ae2d3c4e788..4167031c2aeb54eeecaf9b16ea489bbe7c36c1ad 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -24,17 +24,17 @@
  */
 
 
-#include "content.h"
+#include "audio_content.h"
 #include "change_signaller.h"
-#include "util.h"
+#include "compose.hpp"
+#include "content.h"
 #include "content_factory.h"
-#include "video_content.h"
-#include "audio_content.h"
-#include "text_content.h"
 #include "exceptions.h"
 #include "film.h"
 #include "job.h"
-#include "compose.hpp"
+#include "text_content.h"
+#include "util.h"
+#include "video_content.h"
 #include <dcp/locale_convert.h>
 #include <dcp/raw_convert.h>
 #include <libcxml/cxml.h>

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 6ac673f4d246641326cf1b60a8c6ea2acb90d845..15b18828db50c5349669b68e7493c67b2196f9eb 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -58,7 +58,6 @@ using namespace dcpomatic;
 
 AudioPanel::AudioPanel (ContentPanel* p)
        : ContentSubPanel (p, _("Audio"))
-       , _audio_dialog (0)
 {
 
 }
@@ -219,6 +218,7 @@ AudioPanel::film_changed (Film::Property property)
        }
 }
 
+
 void
 AudioPanel::film_content_changed (int property)
 {
@@ -294,6 +294,7 @@ AudioPanel::film_content_changed (int property)
        }
 }
 
+
 void
 AudioPanel::gain_calculate_button_clicked ()
 {
@@ -325,6 +326,7 @@ AudioPanel::gain_calculate_button_clicked ()
        d->Destroy ();
 }
 
+
 void
 AudioPanel::setup_description ()
 {
@@ -337,6 +339,7 @@ AudioPanel::setup_description ()
        checked_set (_description, ac.front()->audio->processing_description(_parent->film()));
 }
 
+
 void
 AudioPanel::mapping_changed (AudioMapping m)
 {
@@ -346,6 +349,7 @@ AudioPanel::mapping_changed (AudioMapping m)
        }
 }
 
+
 void
 AudioPanel::content_selection_changed ()
 {
@@ -363,6 +367,7 @@ AudioPanel::content_selection_changed ()
        setup_sensitivity ();
 }
 
+
 void
 AudioPanel::setup_sensitivity ()
 {
@@ -395,6 +400,7 @@ AudioPanel::setup_sensitivity ()
        _description->Enable (!ref && single);
 }
 
+
 void
 AudioPanel::show_clicked ()
 {
@@ -412,6 +418,7 @@ AudioPanel::show_clicked ()
        _audio_dialog->Show ();
 }
 
+
 /** @return If there is one selected piece of audio content, return its peak value in dB (if known) */
 optional<float>
 AudioPanel::peak () const
@@ -433,6 +440,7 @@ AudioPanel::peak () const
        return peak_dB;
 }
 
+
 void
 AudioPanel::setup_peak ()
 {
@@ -461,6 +469,7 @@ AudioPanel::setup_peak ()
        }
 }
 
+
 void
 AudioPanel::active_jobs_changed (optional<string> old_active, optional<string> new_active)
 {
@@ -472,6 +481,7 @@ AudioPanel::active_jobs_changed (optional<string> old_active, optional<string> n
        }
 }
 
+
 void
 AudioPanel::reference_clicked ()
 {
@@ -488,6 +498,7 @@ AudioPanel::reference_clicked ()
        d->set_reference_audio (_reference->GetValue ());
 }
 
+
 void
 AudioPanel::set_film (shared_ptr<Film>)
 {

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index bc3bd97553ef114200f3ac72e572d50f3b9ff6fb..2faec25df68f5e33fd09cf8bfe084a1dd8c46f09 100644 (file)
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -77,7 +77,7 @@ private:
        Timecode<dcpomatic::ContentTime>* _fade_out;
        AudioMappingView* _mapping;
        wxStaticText* _description;
-       AudioDialog* _audio_dialog;
+       AudioDialog* _audio_dialog = nullptr;
 
        boost::signals2::scoped_connection _mapping_connection;
        boost::signals2::scoped_connection _active_jobs_connection;