diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | src/wx/audio_dialog.cc | 4 | ||||
| -rw-r--r-- | src/wx/audio_plot.cc | 12 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 2 | ||||
| -rw-r--r-- | wscript | 2 |
6 files changed, 32 insertions, 6 deletions
@@ -1,5 +1,11 @@ 2013-02-27 Carl Hetherington <cth@carlh.net> + * Version 0.75 released. + +2013-02-27 Carl Hetherington <cth@carlh.net> + + * Version 0.75beta1 released. + * Fix support for some YUV444 pixel formats. 2013-02-23 Carl Hetherington <cth@carlh.net> diff --git a/debian/changelog b/debian/changelog index a21623f6a..762660da9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +dvdomatic (0.75-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington <carl@houllier.lan> Wed, 27 Feb 2013 11:03:07 +0000 + +dvdomatic (0.75beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington <carl@houllier.lan> Wed, 27 Feb 2013 08:20:42 +0000 + dvdomatic (0.74-1) UNRELEASED; urgency=low * New upstream release. diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index b7736f664..34dd268f2 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -40,7 +40,7 @@ AudioDialog::AudioDialog (wxWindow* parent) wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { - _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, audio_channel_name (i)); + _channel_checkbox[i] = new wxCheckBox (this, wxID_ANY, std_to_wx (audio_channel_name (i))); table->Add (_channel_checkbox[i], 1, wxEXPAND); table->AddSpacer (0); _channel_checkbox[i]->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (AudioDialog::channel_clicked), 0, this); @@ -88,7 +88,7 @@ AudioDialog::set_film (boost::shared_ptr<Film> f) _film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1)); _film_audio_analysis_finished_connection = _film->AudioAnalysisFinished.connect (bind (&AudioDialog::try_to_load_analysis, this)); - SetTitle (String::compose ("DVD-o-matic audio - %1", _film->name())); + SetTitle (std_to_wx (String::compose ("DVD-o-matic audio - %1", _film->name()))); } void diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 23cbabcdc..9b2e6b1b0 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -146,7 +146,11 @@ AudioPlot::paint (wxPaintEvent &) plot_peak (p, c); } wxColour const col = _colours[c]; - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2))); +#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 + gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); +#else + gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxSOLID)); +#endif gc->StrokePath (p); } } @@ -158,7 +162,11 @@ AudioPlot::paint (wxPaintEvent &) plot_rms (p, c); } wxColour const col = _colours[c]; - gc->SetPen (*wxThePenList->FindOrCreatePen (col)); +#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 9 + gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxPENSTYLE_SOLID)); +#else + gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxSOLID)); +#endif gc->StrokePath (p); } } diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index c9f83677c..499cb1a43 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -348,7 +348,7 @@ FilmEditor::make_audio_panel () grid->AddSpacer (0); for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { - add_label_to_sizer (grid, _audio_panel, audio_channel_name (i)); + add_label_to_sizer (grid, _audio_panel, std_to_wx (audio_channel_name (i))); _external_audio[i] = new wxFilePickerCtrl (_audio_panel, wxID_ANY, wxT (""), _("Select Audio File"), wxT ("*.wav")); grid->Add (_external_audio[i], 1, wxEXPAND); } @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.75pre' +VERSION = '0.76pre' def options(opt): opt.load('compiler_cxx') |