diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-27 13:16:07 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-27 13:16:07 +0100 |
| commit | 475ecb67af7af522ec8796ea1bf0d16602c78273 (patch) | |
| tree | 6a8eb77777211b2ac6903d22858df0afc3188212 | |
| parent | 0efe439f5e2ff5546a75088cca32572e4ffe4341 (diff) | |
Clean up a few bits.
| -rw-r--r-- | src/lib/decoder.cc | 1 | ||||
| -rw-r--r-- | src/lib/film_state.cc | 1 | ||||
| -rw-r--r-- | src/lib/scp_dcp_job.cc | 2 | ||||
| -rw-r--r-- | src/tools/dvdomatic.cc | 2 | ||||
| -rw-r--r-- | windows/installer.nsi.in | 14 |
5 files changed, 3 insertions, 17 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc index 0273b3c01..0a0f7666b 100644 --- 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 0b16f4175..29bf71db3 100644 --- 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 bfa9d056d..f62d2db8d 100644 --- 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 131f0bd71..1394ccff2 100644 --- 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 aa2a0dd26..a0c731c31 100644 --- 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 |