Release Nageru and Futatabi 1.9.1.

diff --git a/NEWS b/NEWS
index d77db7009895ef0b0ee09d4d2b42ef5a18b5b774..0c7835ca522ee7beb5901953ea76bd7418235529 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+Nageru and Futatabi 1.9.1, November 17th, 2019
+
+  - Support disabling optional effects if a given other effect is _enabled_
+    (typically for mutually exclusive effects).
+    
+  - Make it possible for the theme to override the status line, by declaring
+    a function format_status_line() in the theme. Inspired by a C++ patch by
+    Alex Thomazo in the Breizhcamp repository.
+
+  - Various bugfixes.
+
+
 Nageru and Futatabi 1.9.0, July 20th, 2019
 
   - Significant reworking of the theme engine: Chains (now called scenes)

diff --git a/meson.build b/meson.build
index 8114abbd1992711ccf17991c4c346992b5995d22..9880137d11a7f47b36b916507dabd74e7ebf74b0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.9.0')
+project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'], version: '1.9.1')
 
 cxx = meson.get_compiler('cpp')
 qt5 = import('qt5')

diff --git a/nageru/kaeru.cpp b/nageru/kaeru.cpp
index b10324c8b4091516072294a521ce66b76760041e..d9b1e0e0a2d2424433c783068f6aa441c7c9717b 100644 (file)
--- a/nageru/kaeru.cpp
+++ b/nageru/kaeru.cpp
@@ -74,7 +74,7 @@ unique_ptr<Mux> create_mux(HTTPD *httpd, AVOutputFormat *oformat, X264Encoder *x
        // If audio is disabled (ie., we won't ever see any audio packets),
        // set nullptr here to also not include the stream in the mux.
        AVCodecParameters *audio_codecpar =
-               global_flags.enable_audio ? audio_encoder->get_codec_parameters().get() : nullptr;
+               global_flags.enable_audio ? audio_encoder->get_codec_parameters().release() : nullptr;
 
        unique_ptr<Mux> mux;
        mux.reset(new Mux(avctx, global_flags.width, global_flags.height, Mux::CODEC_H264, video_extradata, audio_codecpar,