From: Carl Hetherington <cth@carlh.net>
Date: Tue, 22 Jul 2014 22:26:32 +0000 (+0100)
Subject: Fix some warnings.
X-Git-Tag: v2.0.48~680
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2d8f0f782ccabfa49a14f5fd82c8a5dea521e3cd

Fix some warnings.
---

diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index 0d9bcbacd..9fc69daad 100644
--- a/src/lib/audio_filter.h
+++ b/src/lib/audio_filter.h
@@ -22,7 +22,7 @@
 
 class AudioBuffers;
 class audio_filter_impulse_kernel_test;
-class audio_filter_impulse_input_test;
+struct audio_filter_impulse_input_test;
 
 class AudioFilter
 {
diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index 3c85abd93..8a9525422 100644
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -21,7 +21,7 @@
 #include "audio_mapping.h"
 #include "dcpomatic_time.h"
 
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
 
 class FFmpegAudioStream : public FFmpegStream
 {
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 13c33201e..da8152c0d 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -33,7 +33,7 @@ struct AVStream;
 class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
 
 class FFmpegContentProperty : public VideoContentProperty
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index 4e949d863..8a0823094 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,7 +47,7 @@ class Playlist;
 class AudioContent;
 class Scaler;
 class Screen;
-class isdcf_name_test;
+struct isdcf_name_test;
 
 /** @class Film
  *
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 7d8841304..f9ed15544 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -177,7 +177,7 @@ int main (int argc, char* argv[])
 			} else if (string (optarg) == "dci-specific") {
 				formulation = dcp::DCI_SPECIFIC;
 			} else {
-				error ("unrecognised KDM formulation " + formulation);
+				error ("unrecognised KDM formulation " + string (optarg));
 			}
 		}
 	}
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index d7d2ad349..8e27dc540 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1008,7 +1008,7 @@ public:
 		table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
 		
 		_kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
-		s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border);
+		s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
 
 		_reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
 		s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);