Clean up a few bits.

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 0273b3c012cdcde0577084b426cd59cae9bf0dfc..0a0f7666b1c0ccae08c3df720d71f4e6d3f89580 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -32,7 +32,6 @@ extern "C" {
 #endif
 #include <libavformat/avio.h>
 }
-#include <samplerate.h>
 #include "film.h"
 #include "format.h"
 #include "job.h"

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index 0b16f41753d73d9c4146a8e7dabdebfab86416da..29bf71db332be8045f2c290823b8c469718d2742 100644 (file)
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -279,4 +279,5 @@ FilmState::bytes_per_sample () const
        }
 
        assert (false);
+       return 0;
 }

diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index bfa9d056d09dd3ffafbc6659039d414b1d184148..f62d2db8dd86bb78be6e440319ff0ae8dbb8a06d 100644 (file)
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -225,7 +225,7 @@ SCPDCPJob::status () const
        stringstream s;
        s << Job::status ();
        if (!_status.empty ()) {
-               s << << "; " << _status;
+               s << "; " << _status;
        }
        return s.str ();
 }

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 131f0bd714e6d4fcebec80b3516aa427e3116406..1394ccff2626737ca8d87ea31f708071a19b36ad 100644 (file)
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -268,7 +268,7 @@ public:
 
        void file_open (wxCommandEvent &)
        {
-               wxDirDialog* c = new wxDirDialog (this, wxT ("Open Film"), wxStandardPaths::Get().GetDocumentsDir(), wxDD_DIR_MUST_EXIST);
+               wxDirDialog* c = new wxDirDialog (this, wxT ("Open Film"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
                int const r = c->ShowModal ();
                c->Destroy ();
                

diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in
index aa2a0dd265e8cb480b1b5f81e4a5024e91c9db3d..a0c731c316f29334241dd4c3bc9eb429cea7b906 100644 (file)
--- a/windows/installer.nsi.in
+++ b/windows/installer.nsi.in
@@ -70,19 +70,6 @@ File "%binaries%/src/wx/dvdomatic-wx.dll"
 File "%binaries%/src/lib/dvdomatic.dll"
 File "%binaries%/src/tools/dvdomatic.exe"
 
-CreateDirectory "$INSTDIR\etc\gtk-2.0"
-SetOutPath "$INSTDIR\etc\gtk-2.0"
-File "%deps%/etc/gtk-2.0/im-multipress.conf"
-File "%deps%/etc/gtk-2.0/gtkrc"
-File "%deps%/etc/gtk-2.0/gtk.immodules"
-
-CreateDirectory "$INSTDIR\etc\pango"
-SetOutPath "$INSTDIR\etc\pango"
-File "%deps%/etc/pango/pango.modules"
-
-SetOutPath "$PROFILE"
-File "%resources%/.gtkrc-2.0"
-
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
  
 CreateDirectory "$SMPROGRAMS\DVD-o-matic"
@@ -108,4 +95,3 @@ DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\DVD-o-matic"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DVD-o-matic"
  
 SectionEnd
- 
\ No newline at end of file