Fix some warnings.

diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index 0d9bcbacdb1201a40b62feaac606ffcc16b8d2a9..9fc69daadb23574158e6b298d7b0140a23071716 100644 (file)
--- 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 AudioBuffers;
 class audio_filter_impulse_kernel_test;

-class audio_filter_impulse_input_test;
+struct audio_filter_impulse_input_test;

 
 class AudioFilter
 {
 
 class AudioFilter
 {

diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index 3c85abd93c568a0911262798a34622d62db06197..8a95254227a854ceff99e5ce8d2e79fececb7398 100644 (file)
--- 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"
 
 #include "audio_mapping.h"
 #include "dcpomatic_time.h"
 

-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;

 
 class FFmpegAudioStream : public FFmpegStream
 {
 
 class FFmpegAudioStream : public FFmpegStream
 {

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 13c33201e3275bcfb427eea46c62eae7cc32de78..da8152c0d92816de44a576f718a15f9f94c5db24 100644 (file)
--- 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 Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;

-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;

 
 class FFmpegContentProperty : public VideoContentProperty
 {
 
 class FFmpegContentProperty : public VideoContentProperty
 {

diff --git a/src/lib/film.h b/src/lib/film.h
index 4e949d863330ed1ce8aa4d4889792be5c3996c28..8a0823094e4c0ddf7b272ee05fae332ba631cc25 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,7 +47,7 @@ class Playlist;
 class AudioContent;
 class Scaler;
 class Screen;
 class AudioContent;
 class Scaler;
 class Screen;

-class isdcf_name_test;
+struct isdcf_name_test;

 
 /** @class Film
  *
 
 /** @class Film
  *

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 7d88413041ac1b653f20767a8629ba10c6232add..f9ed155445b5f1852c154b807195602c3d4567b6 100644 (file)
--- 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 {
                        } 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 d7d2ad34966741c7e4a33ad2420e4f1ac5114404..8e27dc540856829651788014866674e54a335112 100644 (file)
--- 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);
                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);
 
                _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
                s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);