Merge master.

diff --git a/ChangeLog b/ChangeLog
index ea301d757079f3465a3d15975d56d7c0fd0dbd78..2d380a8df4cbcd55754ffb24c5cd1f37c5b78500 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,13 @@
 
 2013-03-01  Carl Hetherington  <cth@carlh.net>
 
+       * Version 0.76beta2 released.
+
+2013-03-01  Carl Hetherington  <cth@carlh.net>
+
+       * Add primitive feature to plot graphs
+       of the soundtrack (#67).
+
        * Version 0.76beta1 released.
 
 2013-02-27  Carl Hetherington  <cth@carlh.net>

diff --git a/debian/changelog b/debian/changelog
index 1889c62b881e4778e603c23507419f89c8cece72..dea380364df964d26eef825aada2517b716c1ec3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.76beta2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Fri, 01 Mar 2013 18:32:16 +0000
+
 dvdomatic (0.76beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index a97562b98c1881a983d730e71c4c98d85c370626..a19d2fff13ffe369e28bd1e50e8350d26161a840 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -1067,9 +1067,7 @@ FilmEditor::setup_formats ()
 
        vector<Format const *> fmt = Format::all ();
        for (vector<Format const *>::iterator i = fmt.begin(); i != fmt.end(); ++i) {
-               if (c == VIDEO && dynamic_cast<FixedFormat const *> (*i)) {
-                       _formats.push_back (*i);
-               } else if (c == STILL && dynamic_cast<VariableFormat const *> (*i)) {
+               if (c == VIDEO || (c == STILL && dynamic_cast<VariableFormat const *> (*i))) {
                        _formats.push_back (*i);
                }
        }

diff --git a/wscript b/wscript
index c0fbec87f4b9501d649642439fd8b2a818f3dbf6..23f7dcd1ad68877057fe18b5c0dd3dc4237b10c1 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.76beta1'
+VERSION = '0.76beta2'
 
 def options(opt):
     opt.load('compiler_cxx')