add VU and IEC meter DSP (from jmeters)

[ardour.git] / gtk2_ardour / mouse_cursors.cc

diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc
index 5c06b55803c5e77b2c29a890f353c548ee2a5dd7..98e33d77d696240ca12dfa8151e56bd8459fd5b7 100644 (file)
--- a/gtk2_ardour/mouse_cursors.cc
+++ b/gtk2_ardour/mouse_cursors.cc
@@ -26,30 +26,30 @@ MouseCursors::MouseCursors ()
 {
        using namespace Glib;
        using namespace Gdk;
-       
+
        {
                RefPtr<Pixbuf> p (::get_icon ("zoom_in_cursor"));
-               zoom_in = new Cursor (Display::get_default(), p, 5, 5);
+               zoom_in = new Cursor (Display::get_default(), p, 10, 5);
        }
 
        {
                RefPtr<Pixbuf> p (::get_icon ("zoom_out_cursor"));
                zoom_out = new Cursor (Display::get_default(), p, 5, 5);
        }
-       
+
        Color fbg ("#ffffff");
        Color ffg ("#000000");
 
        {
-               RefPtr<Bitmap> source = Bitmap::create (fader_cursor_bits, fader_cursor_width, fader_cursor_height);
-               RefPtr<Bitmap> mask = Bitmap::create (fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
+               RefPtr<Bitmap> source = Bitmap::create ((char const *) fader_cursor_bits, fader_cursor_width, fader_cursor_height);
+               RefPtr<Bitmap> mask = Bitmap::create ((char const *) fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
                fader = new Cursor (source, mask, ffg, fbg, fader_cursor_x_hot, fader_cursor_y_hot);
        }
 
        {
-               RefPtr<Bitmap> source = Bitmap::create (speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
-               RefPtr<Bitmap> mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
-               speaker = new Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
+               RefPtr<Bitmap> source = Bitmap::create ((char const *) speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
+               RefPtr<Bitmap> mask = Bitmap::create ((char const *) speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
+               speaker = new Cursor (source, mask, ffg, fbg, speaker_cursor_width >> 1, speaker_cursor_height >> 1);
        }
 
        {
@@ -103,7 +103,7 @@ MouseCursors::MouseCursors ()
                RefPtr<Pixbuf> p (::get_icon ("trim_right_cursor_left_only"));
                right_side_trim_left_only = new Cursor (Display::get_default(), p, 23, 11);
        }
-       
+
        {
                RefPtr<Pixbuf> p (::get_icon ("fade_in_cursor"));
                fade_in = new Cursor (Display::get_default(), p, 0, 0);
@@ -168,8 +168,12 @@ MouseCursors::MouseCursors ()
                RefPtr<Pixbuf> p (::get_icon ("expand_up_down_cursor"));
                expand_up_down = new Cursor (Display::get_default(), p, 4, 11);
        }
-       
-       selector = new Cursor (XTERM);
+
+       {
+               RefPtr<Pixbuf> p (::get_icon ("i_beam_cursor"));
+               selector = new Cursor (Display::get_default(), p, 4, 11);
+       }
+
        time_fx = new Cursor (SIZING);
        wait = new Cursor (WATCH);
        timebar = new Cursor(LEFT_PTR);