From 09ed8e8404617c323ce18fdfd1ff0636dd246a38 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Apr 2013 22:05:51 +0100 Subject: ChangeLog. --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 3499d97ed..f84e5a72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ * Fix error message on forcing language to English (#103). + * Fix problems with content whose first audio content + comes before the first video (resulting in audio being + chopped off at the start of the DCP) (#79). + + * Use true 4:3 rather than 1.33. + 2013-04-13 Carl Hetherington * Use film-name-derived names for MXFs in DCPs (#54). -- cgit v1.2.3 From b42d3dfaf80acf5d9259a2fe9d14e0e50c1057f7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Apr 2013 23:32:17 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index f84e5a72f..c428ad462 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-18 Carl Hetherington + + * Version 0.84beta1 released. + 2013-04-15 Carl Hetherington * Fix error message on forcing language to English (#103). diff --git a/debian/changelog b/debian/changelog index d1cea437d..eff7975f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.84beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 18 Apr 2013 23:32:17 +0100 + dvdomatic (0.83-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 5b0babd90..3ff10f4ab 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84pre' +VERSION = '0.84beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c76d57eddc0b6633161cb131133a07e8764dd7e9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Apr 2013 11:12:09 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index c428ad462..0d44c0187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-19 Carl Hetherington + + * Version 0.84beta2 released. + 2013-04-18 Carl Hetherington * Version 0.84beta1 released. diff --git a/debian/changelog b/debian/changelog index eff7975f7..8abbb4e7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.84beta2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Fri, 19 Apr 2013 11:12:09 +0100 + dvdomatic (0.84beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 3ff10f4ab..9f159a6fb 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84beta1' +VERSION = '0.84beta2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From bb73db4abf9a80473e025d1a0083ad3f98c66c47 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Apr 2013 11:36:37 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 0d44c0187..0d2d02f08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-19 Carl Hetherington + + * Version 0.84beta3 released. + 2013-04-19 Carl Hetherington * Version 0.84beta2 released. diff --git a/debian/changelog b/debian/changelog index 8abbb4e7e..43a299fe9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.84beta3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Fri, 19 Apr 2013 11:36:37 +0100 + dvdomatic (0.84beta2-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 9f159a6fb..d792891f9 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84beta2' +VERSION = '0.84beta3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a25cdee1b5b9deaa4414c7f1ddac3f55c03227c1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Apr 2013 17:41:58 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 0d2d02f08..fb526efd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-19 Carl Hetherington + + * Version 0.84beta4 released. + 2013-04-19 Carl Hetherington * Version 0.84beta3 released. diff --git a/debian/changelog b/debian/changelog index 43a299fe9..46f82cf52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.84beta4-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Fri, 19 Apr 2013 17:41:58 +0100 + dvdomatic (0.84beta3-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index d792891f9..400018e89 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84beta3' +VERSION = '0.84beta4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f2989966b2871ac5fc5f78c2a3ce7867f344b7cd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 19 Apr 2013 22:10:10 +0100 Subject: Basic frame index and timecode (part of #68). --- ChangeLog | 2 ++ src/wx/film_viewer.cc | 24 ++++++++++++++++++++++++ src/wx/film_viewer.h | 2 ++ 3 files changed, 28 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index fb526efd1..12890135c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2013-04-19 Carl Hetherington + * Add basic frame index and timecode to viewer (part of #68). + * Version 0.84beta4 released. 2013-04-19 Carl Hetherington diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 40b74ac39..00f895285 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -51,6 +51,8 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) : wxPanel (p) , _panel (new wxPanel (this)) , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096)) + , _frame (new wxStaticText (this, wxID_ANY, wxT(""))) + , _timecode (new wxStaticText (this, wxID_ANY, wxT(""))) , _play_button (new wxToggleButton (this, wxID_ANY, _("Play"))) , _display_frame_x (0) , _got_frame (false) @@ -66,11 +68,19 @@ FilmViewer::FilmViewer (shared_ptr f, wxWindow* p) _v_sizer->Add (_panel, 1, wxEXPAND); wxBoxSizer* h_sizer = new wxBoxSizer (wxHORIZONTAL); + + wxBoxSizer* time_sizer = new wxBoxSizer (wxVERTICAL); + time_sizer->Add (_frame, 0, wxEXPAND); + time_sizer->Add (_timecode, 0, wxEXPAND); + + h_sizer->Add (time_sizer, 0, wxEXPAND); h_sizer->Add (_play_button, 0, wxEXPAND); h_sizer->Add (_slider, 1, wxEXPAND); _v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6); + _frame->SetMinSize (wxSize (84, -1)); + _panel->Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (FilmViewer::paint_panel), 0, this); _panel->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (FilmViewer::panel_sized), 0, this); _slider->Connect (wxID_ANY, wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler (FilmViewer::slider_moved), 0, this); @@ -390,6 +400,20 @@ FilmViewer::process_video (shared_ptr image, bool, shared_ptr s raw_to_display (); _got_frame = true; + + double const t = _decoders.video->last_source_time (); + double const fps = _decoders.video->frames_per_second (); + _frame->SetLabel (wxString::Format ("%d", int (rint (t * fps)))); + + double w = t; + int const h = (w / 3600); + w -= h * 3600; + int const m = (w / 60); + w -= m * 60; + int const s = floor (w); + w -= s; + int const f = rint (w * fps); + _timecode->SetLabel (wxString::Format ("%02d:%02d:%02d:%02d", h, m, s, f)); } void diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index 784434f6b..859bf7ede 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -62,6 +62,8 @@ private: wxSizer* _v_sizer; wxPanel* _panel; wxSlider* _slider; + wxStaticText* _frame; + wxStaticText* _timecode; wxToggleButton* _play_button; wxTimer _timer; -- cgit v1.2.3 From 7c02c5d112ff07e3e97a70c367f4cffc183581cd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Apr 2013 02:27:59 +0100 Subject: ChangeLog. --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 12890135c..85cdb48a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2013-04-19 Carl Hetherington - * Add basic frame index and timecode to viewer (part of #68). + * Add basic frame index and timecode to viewer, and previous/next + frame buttons. * Version 0.84beta4 released. -- cgit v1.2.3 From f20cd70a9afc28f785ef4a50c875ccf6c3729462 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 20 Apr 2013 20:45:32 +0100 Subject: Import Ardour's LocaleGuard to fix problems with saving decimals to metadata (#119). --- ChangeLog | 5 +++++ src/lib/film.cc | 3 +++ src/lib/util.cc | 19 +++++++++++++++++++ src/lib/util.h | 11 +++++++++++ 4 files changed, 38 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 85cdb48a6..0fbb73773 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-04-20 Carl Hetherington + + * Fix bad saving of metadata in locales which use + commas to separate decimals (#119). + 2013-04-19 Carl Hetherington * Add basic frame index and timecode to viewer, and previous/next diff --git a/src/lib/film.cc b/src/lib/film.cc index 227f8557b..b0785df34 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -204,6 +204,7 @@ string Film::video_state_identifier () const { assert (format ()); + LocaleGuard lg; pair f = Filter::ffmpeg_strings (filters()); @@ -428,6 +429,7 @@ void Film::write_metadata () const { boost::mutex::scoped_lock lm (_state_mutex); + LocaleGuard lg; boost::filesystem::create_directories (directory()); @@ -515,6 +517,7 @@ void Film::read_metadata () { boost::mutex::scoped_lock lm (_state_mutex); + LocaleGuard lg; _external_audio.clear (); _content_audio_streams.clear (); diff --git a/src/lib/util.cc b/src/lib/util.cc index 557e9a34b..e43b598ab 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1018,3 +1018,22 @@ FrameRateConversion::FrameRateConversion (float source, int dcp) } } } + +LocaleGuard::LocaleGuard () + : _old (0) +{ + char const * old = setlocale (LC_NUMERIC, 0); + + if (old) { + _old = strdup (old); + if (strcmp (_old, "POSIX")) { + setlocale (LC_NUMERIC, "POSIX"); + } + } +} + +LocaleGuard::~LocaleGuard () +{ + setlocale (LC_NUMERIC, _old); + free (_old); +} diff --git a/src/lib/util.h b/src/lib/util.h index 3d251cf06..31d0fc967 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -293,5 +293,16 @@ extern int64_t video_frames_to_audio_frames (SourceFrame v, float audio_sample_r extern bool still_image_file (std::string); extern std::pair cpu_info (); +class LocaleGuard +{ +public: + LocaleGuard (); + ~LocaleGuard (); + +private: + char* _old; +}; + + #endif -- cgit v1.2.3 From 4e0efeb6fb6a35bba81124d6d35d220ee2d723e8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 21 Apr 2013 00:06:12 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 0fbb73773..4caba4a85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-21 Carl Hetherington + + * Version 0.84beta5 released. + 2013-04-20 Carl Hetherington * Fix bad saving of metadata in locales which use diff --git a/debian/changelog b/debian/changelog index 46f82cf52..f9146ff6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.84beta5-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 21 Apr 2013 00:06:12 +0100 + dvdomatic (0.84beta4-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 400018e89..185763087 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84beta4' +VERSION = '0.84beta5' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 000f4f854f40b51f082575366ea41d3d7d8777b5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 21 Apr 2013 14:34:06 +0100 Subject: Remove old merge tag. --- ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 4caba4a85..bbd1966f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -521,7 +521,6 @@ 2012-12-18 Carl Hetherington * Version 0.65 released. ->>>>>>> master 2012-12-13 Carl Hetherington -- cgit v1.2.3 From dd17ad210b3f4489949c908841f5e90136393dc8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 21 Apr 2013 17:49:54 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index bbd1966f8..ffbbcfb2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-21 Carl Hetherington + + * Version 0.84 released. + 2013-04-21 Carl Hetherington * Version 0.84beta5 released. diff --git a/debian/changelog b/debian/changelog index f9146ff6e..eab1f4b4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.84-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 21 Apr 2013 17:49:54 +0100 + dvdomatic (0.84beta5-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 185763087..1d85d3fbf 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.84beta5' +VERSION = '0.84' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3