change rendering technique for waveforms, add back optional gradient, add back amplit...

[ardour.git] / gtk2_ardour / itest.cc

diff --git a/gtk2_ardour/itest.cc b/gtk2_ardour/itest.cc
index 29d15aee988dcf56db935245fbe6f32d5f183201..db6ede0fd2f29bfdd62823ee843f173e0c91c3ae 100644 (file)
--- a/gtk2_ardour/itest.cc
+++ b/gtk2_ardour/itest.cc
@@ -35,7 +35,6 @@
 #include <jack/jack.h>
 
 using namespace std;
-using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace Glib;
@@ -47,7 +46,7 @@ struct ModelColumns : public TreeModel::ColumnRecord {
            add (port);
     }
     TreeModelColumn<bool>         used;
-    TreeModelColumn<ustring>      text;
+    TreeModelColumn<string>      text;
     TreeModelColumn<jack_port_t*> port;
 };
 
@@ -181,8 +180,8 @@ main (int argc, char* argv[])
        displayA.signal_object_drop.connect (ptr_fun (object_drop));
 
        displayA.get_selection()->set_mode (SELECTION_MULTIPLE);
-       displayA.get_selection()->set_select_function (bind (ptr_fun (selection_filter), &columns));
-       displayA.get_selection()->signal_changed().connect (bind (ptr_fun (selection_changed), modelA, &displayA, &columns));
+       displayA.get_selection()->set_select_function (sigc::bind (ptr_fun (selection_filter), &columns));
+       displayA.get_selection()->signal_changed().connect (sigc::bind (ptr_fun (selection_changed), modelA, &displayA, &columns));
 
        displayB.set_model (modelB);
        displayB.append_column ("Use", columns.used);
@@ -192,8 +191,8 @@ main (int argc, char* argv[])
        displayB.signal_object_drop.connect (ptr_fun (object_drop));
 
        displayB.get_selection()->set_mode (SELECTION_MULTIPLE);
-       displayB.get_selection()->set_select_function (bind (ptr_fun (selection_filter), &columns));
-       displayB.get_selection()->signal_changed().connect (bind (ptr_fun (selection_changed), modelB, &displayB, &columns));
+       displayB.get_selection()->set_select_function (sigc::bind (ptr_fun (selection_filter), &columns));
+       displayB.get_selection()->signal_changed().connect (sigc::bind (ptr_fun (selection_changed), modelB, &displayB, &columns));
 
        scrollerA.add (displayA);
        scrollerB.add (displayB);
@@ -208,8 +207,8 @@ main (int argc, char* argv[])
        win.set_size_request (500, 400);
        win.show_all ();
 
-       rescan.signal_clicked().connect (bind (ptr_fun (fill_it), modelA, &displayA, &columns));
-       rescan.signal_clicked().connect (bind (ptr_fun (fill_it), modelB, &displayB, &columns));
+       rescan.signal_clicked().connect (sigc::bind (ptr_fun (fill_it), modelA, &displayA, &columns));
+       rescan.signal_clicked().connect (sigc::bind (ptr_fun (fill_it), modelB, &displayB, &columns));
 
        fill_it (modelA, &displayA, &columns);
        fill_it (modelB, &displayB, &columns);