pixbufs instead of pixmaps; function-scope local fd's for reading from a FileSource

git-svn-id: svn://localhost/trunk/ardour2@395 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 17 insertions, 11 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 5e4eac768b..a92e9edd8c 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -36,7 +36,6 @@
 #include <pbd/pathscanner.h>
 #include <pbd/failed_constructor.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/pix.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/fastmeter.h>
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 7655931904..c55ba08f8f 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -29,7 +29,6 @@
 #include <pbd/error.h>
 #include <pbd/basename.h>
 #include <pbd/fastlog.h>
-#include <gtkmm2ext/pix.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/click_box.h>
 #include <gtkmm2ext/tearoff.h>
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index eb5b78c993..b070dd09ad 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -28,7 +28,6 @@
 #include <ardour/dB.h>
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/pix.h>
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/barcontroller.h>
@@ -55,18 +54,27 @@ using namespace std;
 
 sigc::signal<void> GainMeter::ResetAllPeakDisplays;
 sigc::signal<void,RouteGroup*> GainMeter::ResetGroupPeakDisplays;
-Pix* GainMeter::slider_pix = 0;
+Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
+Glib::RefPtr<Gdk::Pixbuf> GainMeter::rail;
 map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps;
 
 int
 GainMeter::setup_slider_pix ()
 {
-	if ((slider_pix = get_pix (ARDOUR::find_data_file("pixmaps"), "vslider02", false)) == 0) {
-		error << _("Cannot create slider pixmaps") << endmsg;
+	string path = ARDOUR::find_data_file("vslider02_slider.xpm", "pixmaps");
+	if (path.empty()) {
+		error << _("cannot find images for fader slider") << endmsg;
 		return -1;
 	}
+	slider = Gdk::Pixbuf::create_from_file (path);
+
+	path = ARDOUR::find_data_file("vslider02_rail.xpm", "pixmaps");
+	if (path.empty()) {
+		error << _("cannot find images for fader rail") << endmsg;
+		return -1;
+	}
+	rail = Gdk::Pixbuf::create_from_file (path);
 
-	slider_pix->ref ();
 	return 0;
 }
 
@@ -95,14 +103,14 @@ GainMeter::GainMeter (IO& io, Session& s)
 	  top_table (1, 2)
 	
 {
-	if (slider_pix == 0) {
+	if (slider == 0) {
 		setup_slider_pix ();
 	}
 
 	ignore_toggle = false;
 	meter_menu = 0;
 	
-	gain_slider = manage (new VSliderController (slider_pix,
+	gain_slider = manage (new VSliderController (slider, rail,
 						     &gain_adjustment,
 						     & _io.midi_gain_control(),
 						     false));
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index a1a91ced08..d30f21314f 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -49,7 +49,6 @@ namespace ARDOUR {
 namespace Gtkmm2ext {
 	class FastMeter;
 	class BarController;
-	class Pix;
 }
 namespace Gtk {
 	class Menu;
@@ -161,7 +160,8 @@ class GainMeter : public Gtk::VBox
 	static sigc::signal<void> ResetAllPeakDisplays;
 	static sigc::signal<void,ARDOUR::RouteGroup*> ResetGroupPeakDisplays;
 
-	static Gtkmm2ext::Pix* slider_pix;
+	static Glib::RefPtr<Gdk::Pixbuf> slider;
+	static Glib::RefPtr<Gdk::Pixbuf> rail;
 	static int setup_slider_pix ();
 };