svn commit: r460224 - head/audio/ardour/files

[Alexey Dokuchaev]

Author: danfe
Date: Sun Jan 28 17:00:07 2018
New Revision: 460224
URL: https://svnweb.freebsd.org/changeset/ports/460224

Log:
  Add four more patches that should've been part of r460055.

Added:
  head/audio/ardour/files/patch-gtk2__ardour_editor.cc   (contents, props changed)
  head/audio/ardour/files/patch-gtk2__ardour_gain__meter.cc   (contents, props changed)
  head/audio/ardour/files/patch-gtk2__ardour_route__time__axis.cc   (contents, props changed)
  head/audio/ardour/files/patch-libs_gtkmm2ext_fastmeter.cc   (contents, props changed)

Added: head/audio/ardour/files/patch-gtk2__ardour_editor.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/ardour/files/patch-gtk2__ardour_editor.cc	Sun Jan 28 17:00:07 2018	(r460224)
@@ -0,0 +1,23 @@
+--- gtk2_ardour/editor.cc.orig	2012-03-16 14:33:28 UTC
++++ gtk2_ardour/editor.cc
+@@ -803,16 +803,16 @@ Editor::Editor ()
+ 	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()) {

Added: head/audio/ardour/files/patch-gtk2__ardour_gain__meter.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/ardour/files/patch-gtk2__ardour_gain__meter.cc	Sun Jan 28 17:00:07 2018	(r460224)
@@ -0,0 +1,25 @@
+--- gtk2_ardour/gain_meter.cc.orig	2010-04-20 17:28:37 UTC
++++ gtk2_ardour/gain_meter.cc
+@@ -63,7 +63,7 @@ Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
+ void
+ GainMeter::setup_slider_pix ()
+ {
+-	if ((slider = ::get_icon ("fader_belt")) == 0) {
++	if (!(slider = ::get_icon ("fader_belt"))) {
+ 		throw failed_constructor();
+ 	}
+ }
+@@ -89,11 +89,11 @@ GainMeterBase::GainMeterBase (Session& s, 
+ 	if (horizontal) {
+ 		gain_slider = manage (new HSliderController (pix,
+ 							     &gain_adjustment,
+-							     false));
++							     0x0));
+ 	} else {
+ 		gain_slider = manage (new VSliderController (pix,
+ 							     &gain_adjustment,
+-							     false));
++							     0x0));
+ 	}
+ 
+ 	level_meter = new LevelMeter(_session);

Added: head/audio/ardour/files/patch-gtk2__ardour_route__time__axis.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/ardour/files/patch-gtk2__ardour_route__time__axis.cc	Sun Jan 28 17:00:07 2018	(r460224)
@@ -0,0 +1,11 @@
+--- gtk2_ardour/route_time_axis.cc.orig	2010-04-17 15:23:01 UTC
++++ gtk2_ardour/route_time_axis.cc
+@@ -89,7 +89,7 @@ Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider;
+ void
+ RouteTimeAxisView::setup_slider_pix ()
+ {
+-	if ((slider = ::get_icon ("fader_belt_h")) == 0) {
++	if (!(slider = ::get_icon ("fader_belt_h"))) {
+ 		throw failed_constructor ();
+ 	}
+ }

Added: head/audio/ardour/files/patch-libs_gtkmm2ext_fastmeter.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/ardour/files/patch-libs_gtkmm2ext_fastmeter.cc	Sun Jan 28 17:00:07 2018	(r460224)
@@ -0,0 +1,11 @@
+--- libs/gtkmm2ext/fastmeter.cc.orig	2009-02-24 12:37:45 UTC
++++ libs/gtkmm2ext/fastmeter.cc
+@@ -476,7 +476,7 @@ FastMeter::set (float lvl)
+ 
+ 	Glib::RefPtr<Gdk::Window> win;
+ 
+-	if ((win = get_window()) == 0) {
++	if (!(win = get_window())) {
+ 		queue_draw ();
+ 		return;
+ 	}