svn commit: r461480 - head/audio/ardour/files
Alexey Dokuchaev
danfe at FreeBSD.org
Sun Feb 11 09:14:01 UTC 2018
Author: danfe
Date: Sun Feb 11 09:14:00 2018
New Revision: 461480
URL: https://svnweb.freebsd.org/changeset/ports/461480
Log:
Fix another several issues that were upsetting new Clang, missed in r460224.
Added:
head/audio/ardour/files/patch-gtk2__ardour_editor__keyboard.cc (contents, props changed)
Modified:
head/audio/ardour/files/patch-SConstruct
head/audio/ardour/files/patch-gtk2__ardour_editor.cc
head/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
head/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc
Modified: head/audio/ardour/files/patch-SConstruct
==============================================================================
--- head/audio/ardour/files/patch-SConstruct Sun Feb 11 09:02:51 2018 (r461479)
+++ head/audio/ardour/files/patch-SConstruct Sun Feb 11 09:14:00 2018 (r461480)
@@ -32,7 +32,7 @@
env.Append(CCFLAGS="-Wall")
-env.Append(CXXFLAGS="-Woverloaded-virtual")
-+env.Append(CXXFLAGS="-Woverloaded-virtual -std=c++11")
++env.Append(CXXFLAGS="-Woverloaded-virtual -std=c++11 -Wno-c++11-narrowing")
if env['EXTRA_WARN']:
env.Append(CCFLAGS="-Wextra -pedantic -ansi")
Modified: head/audio/ardour/files/patch-gtk2__ardour_editor.cc
==============================================================================
--- head/audio/ardour/files/patch-gtk2__ardour_editor.cc Sun Feb 11 09:02:51 2018 (r461479)
+++ head/audio/ardour/files/patch-gtk2__ardour_editor.cc Sun Feb 11 09:14:00 2018 (r461480)
@@ -21,3 +21,13 @@
window_icons.push_back (icon);
}
if (!window_icons.empty()) {
+@@ -1862,8 +1862,7 @@ Editor::add_region_context_items (AudioStreamView* sv,
+ become selected.
+ */
+
+- region_menu->signal_map_event().connect (
+- bind (
++ region_menu->signal_map_event().connect ( bind (
+ mem_fun(*this, &Editor::set_selected_regionview_from_map_event),
+ sv,
+ boost::weak_ptr<Region>(region)
Added: head/audio/ardour/files/patch-gtk2__ardour_editor__keyboard.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/ardour/files/patch-gtk2__ardour_editor__keyboard.cc Sun Feb 11 09:14:00 2018 (r461480)
@@ -0,0 +1,14 @@
+--- gtk2_ardour/editor_keyboard.cc.orig 2009-03-02 21:07:08 UTC
++++ gtk2_ardour/editor_keyboard.cc
+@@ -42,9 +42,9 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot
+ Glib::RefPtr<Gdk::Window> evw = track_canvas->get_window()->get_pointer (x, y, mask);
+ bool doit = false;
+
+- if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
++ if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
+ doit = true;
+- } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
++ } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
+ doit = true;
+ }
+
Modified: head/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
==============================================================================
--- head/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc Sun Feb 11 09:02:51 2018 (r461479)
+++ head/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc Sun Feb 11 09:14:00 2018 (r461480)
@@ -31,3 +31,21 @@
VBox* vbox = msg.get_vbox();
HBox hbox;
+@@ -1964,7 +1969,7 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine,
+
+ const char **connections = io.input(0)->get_connections();
+
+- if (connections == 0 || connections[0] == '\0') {
++ if (connections == 0 || *connections[0] == '\0') {
+ buf = _("off");
+ } else {
+ buf = connections[0];
+@@ -1983,7 +1988,7 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine,
+
+ const char **connections = io.output(0)->get_connections();
+
+- if (connections == 0 || connections[0] == '\0') {
++ if (connections == 0 || *connections[0] == '\0') {
+ buf = _("off");
+ } else {
+ buf = connections[0];
Modified: head/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc
==============================================================================
--- head/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc Sun Feb 11 09:02:51 2018 (r461479)
+++ head/audio/ardour/files/patch-gtk2_ardour-new_session_dialog.cc Sun Feb 11 09:14:00 2018 (r461480)
@@ -1,6 +1,27 @@
--- gtk2_ardour/new_session_dialog.cc.orig 2008-01-14 10:04:17.000000000 +0100
+++ gtk2_ardour/new_session_dialog.cc 2008-01-14 10:04:44.000000000 +0100
-@@ -556,7 +556,7 @@
+@@ -361,16 +361,16 @@ NewSessionDialog::NewSessionDialog()
+ list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
+ Glib::RefPtr<Gdk::Pixbuf> icon;
+
+- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
++ if ((icon = ::get_icon ("ardour_icon_16px"))) {
+ window_icons.push_back (icon);
+ }
+- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
++ if ((icon = ::get_icon ("ardour_icon_22px"))) {
+ window_icons.push_back (icon);
+ }
+- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
++ if ((icon = ::get_icon ("ardour_icon_32px"))) {
+ window_icons.push_back (icon);
+ }
+- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
++ if ((icon = ::get_icon ("ardour_icon_48px"))) {
+ window_icons.push_back (icon);
+ }
+ if (!window_icons.empty()) {
+@@ -589,7 +589,7 @@ NewSessionDialog::set_session_folder(const std::string
*/
More information about the svn-ports-head
mailing list