| [proaudio] [1209] seq24: add sigc++ >=2.2 fix |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1209
Author: gimpel
Date: 2008-05-03 10:35:41 +0200 (Sat, 03 May 2008)
Log Message:
-----------
seq24: add sigc++ >=2.2 fix
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/seq24/ChangeLog
trunk/overlays/proaudio/media-sound/seq24/Manifest
trunk/overlays/proaudio/media-sound/seq24/seq24-0.8.7.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.8.7-sigc22_fix.patch
Modified: trunk/overlays/proaudio/media-sound/seq24/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/ChangeLog 2008-05-02 14:30:27 UTC (rev 1208)
+++ trunk/overlays/proaudio/media-sound/seq24/ChangeLog 2008-05-03 08:35:41 UTC (rev 1209)
@@ -1,7 +1,11 @@
# ChangeLog for media-sound/seq24
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 May 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+ +files/seq24-0.8.7-sigc22_fix.patch, seq24-0.8.7.ebuild:
+ fix compile error agains libsigc++ >= 2.2
+
17 Dec 2007; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> ChangeLog:
added a changelog
Modified: trunk/overlays/proaudio/media-sound/seq24/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/Manifest 2008-05-02 14:30:27 UTC (rev 1208)
+++ trunk/overlays/proaudio/media-sound/seq24/Manifest 2008-05-03 08:35:41 UTC (rev 1209)
@@ -3,6 +3,7 @@
AUX seq24-0.8.7-label-fix.diff 418 RMD160 ee4699fa03ae345b31ac5e9b160c3dff76f50163 SHA1 2c8511b281858d99188984a9e6900362247f66d8 SHA256 4f71ad71f4a0b8e041da77b80518ad844c6c60cb99e51688dfa18d10db299fb9
AUX seq24-0.8.7-menu-changes.diff 3446 RMD160 0be7c10a7b56cbf5fb227c9cd7432b33c70915cf SHA1 35fff69d41293342b1dd07a8aa9a7dec6a13e51c SHA256 30e2082ccf9a4ddece01aafa672f2ac3f1cbc5b8b7c308a6b5e247c7073af96b
AUX seq24-0.8.7-sams.patch 17299 RMD160 c19a5bc3338cc0ead64e96ba3a8272a6f5f92ac2 SHA1 8997715a54fccd3df85b0eeabc1bc3c8ae579e69 SHA256 409f2eb48ec9859e2c2b2a8216f45c4def324417197af4bc899f3a6b599d6180
+AUX seq24-0.8.7-sigc22_fix.patch 36808 RMD160 5c148b62896be119e4a92ecc36fd240aeca608f3 SHA1 11281bdc5ec05915b7d37f5d0d5243bc38e53afa SHA256 2bdd95d4abec0d6f646a162bf53c65f05a399000b1631488e183b646cf9eb2b0
AUX seq24-0.8.7.olivier.patch 30802 RMD160 f5f1c89c450f105481afaf5af9cf266f83d9fc58 SHA1 696e0921f25b2b8e07eef410ac7b16d3a5835e55 SHA256 eca19d6d017fdad07e8870ac9001125172b794eb2f321c85647a584c09879c98
AUX seq24-0.8.7.olivier2.patch 47109 RMD160 bf853107670de5b79dfc734c1c1a93ff19768b9d SHA1 83679034e6ec12e2ce7eeb31a7b112dfd7007d72 SHA256 50f39e209be96091e59b00f97243123d629a669ac04c1dbb64baa4ce0719f0b4
AUX seq24-0.8.7.prio.diff 3013 RMD160 66cae26eede06323cd03896a634a946a34ad0aaf SHA1 d98ad460499f780457a643c488f0f46b81e66a2e SHA256 b801e9256bfc17b3995f846c74f2b672c6d4a7ee1b71def16d1a070a45bf0310
@@ -12,6 +13,6 @@
DIST seq24-0.8.7.tar.gz 194461 RMD160 16d9ba737023eb2d7dccf5d9de604287812b929a SHA1 a6c611740a14c72681615b99c35afae3d7e3d69f SHA256 fba9c547999c2fa68c993bf2e367087343ec2948cd1172d447e008e1fa52b3ee
EBUILD seq24-0.8.3-r2.ebuild 1125 RMD160 7bf67289fcc418b3cab3d22be35fe59381992264 SHA1 9a1192b518a68cbdbe8a98ce86fff1ee3e60d4d4 SHA256 35ed11f2d89a484aa269f7b6f7ba54c1e1dfadc89e971546d82a961b54dc157c
EBUILD seq24-0.8.6.ebuild 1063 RMD160 8bf0c564d01ec7973ffdc37ee14971c9a02d7fb7 SHA1 932f0fa1ef1fbc742a31194356271e51b659d605 SHA256 f59e9fe421f214faedcf6ddfab37a0cc59d66148f94a41e8df73c96faf63d91b
-EBUILD seq24-0.8.7.ebuild 1378 RMD160 601058b2a6997bbf92db64b784a92ab9b695f662 SHA1 b243182415ce6c4839e9f5c2526860d35bedbe31 SHA256 83c2b1ef7295c1d3b5fd4a1d968783662fe01a3734bf71e3edebd2e3593d1701
-MISC ChangeLog 205 RMD160 70bc59079891cd5870e8503becfc75abe6e483ef SHA1 72a184b4594b8508d8683c89a5a399fb2b2a2f62 SHA256 47049235e1d0d197eb0d94e147b6197d57b46a7a57bb33b877bc93e9931a9157
+EBUILD seq24-0.8.7.ebuild 1538 RMD160 b517bb5918926fda5f57e6a00f54082a5c219d13 SHA1 bd1558044f45fcade2ffa2b57f786617f8cc134c SHA256 f6b4cba4235c808786265533d667095dbb14ca9af853fdf52be84f492753342a
+MISC ChangeLog 364 RMD160 cd685f387452ce888f0f2c3fad42cc70c2b1a332 SHA1 971e81f83650101688cc9cdb499893e821a88455 SHA256 d254343d784fc6bd857746341b975d8328e4f1e7da416518d126bbddf6a7703c
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Added: trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.8.7-sigc22_fix.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.8.7-sigc22_fix.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/seq24/files/seq24-0.8.7-sigc22_fix.patch 2008-05-03 08:35:41 UTC (rev 1209)
@@ -0,0 +1,534 @@
+diff -Naur seq24-0.8.7-org/src/event.cpp seq24-0.8.7/src/event.cpp
+--- seq24-0.8.7-org/src/event.cpp 2006-06-02 05:20:20.000000000 +0200
++++ seq24-0.8.7/src/event.cpp 2008-05-01 20:56:28.000000000 +0200
+@@ -18,6 +18,7 @@
+ //
+ //-----------------------------------------------------------------------------
+ #include "event.h"
++#include <cstring>
+
+ event::event()
+ {
+diff -Naur seq24-0.8.7-org/src/font.cpp seq24-0.8.7/src/font.cpp
+--- seq24-0.8.7-org/src/font.cpp 2006-03-28 06:37:00.000000000 +0200
++++ seq24-0.8.7/src/font.cpp 2008-05-01 21:14:25.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "font_b.xpm"
+
+ #include <string>
++#include <cstring>
+
+ font::font( )
+ {
+diff -Naur seq24-0.8.7-org/src/mainwnd.h seq24-0.8.7/src/mainwnd.h
+--- seq24-0.8.7-org/src/mainwnd.h 2006-03-28 06:36:59.000000000 +0200
++++ seq24-0.8.7/src/mainwnd.h 2008-05-01 20:55:32.000000000 +0200
+@@ -109,7 +109,7 @@
+
+ Entry *m_entry_notes;
+
+- SigC::Connection m_timeout_connect;
++ sigc::connection m_timeout_connect;
+
+ void file_new_dialog( void );
+ void file_save_dialog( void );
+diff -Naur seq24-0.8.7-org/src/options.cpp seq24-0.8.7/src/options.cpp
+--- seq24-0.8.7-org/src/options.cpp 2006-03-28 06:36:59.000000000 +0200
++++ seq24-0.8.7/src/options.cpp 2008-05-01 21:14:05.000000000 +0200
+@@ -21,7 +21,6 @@
+ #include "options.h"
+ #include <sstream>
+
+-
+ const int c_status = 0;
+ const int c_status_inv = 1;
+ const int c_d1 = 2;
+@@ -86,9 +85,9 @@
+ rb_on->set_group (group);
+ rb_mod->set_group (group);
+
+- rb_off->signal_toggled().connect (SigC::bind(mem_fun (*this, &options::clock_callback_off), i, rb_off ));
+- rb_on->signal_toggled ().connect (SigC::bind(mem_fun (*this, &options::clock_callback_on), i, rb_on ));
+- rb_mod->signal_toggled().connect (SigC::bind(mem_fun (*this, &options::clock_callback_mod), i, rb_mod ));
++ rb_off->signal_toggled().connect (sigc::bind(mem_fun (*this, &options::clock_callback_off), i, rb_off ));
++ rb_on->signal_toggled ().connect (sigc::bind(mem_fun (*this, &options::clock_callback_on), i, rb_on ));
++ rb_mod->signal_toggled().connect (sigc::bind(mem_fun (*this, &options::clock_callback_mod), i, rb_mod ));
+
+ hbox2->pack_end (*rb_mod, false, false );
+ hbox2->pack_end (*rb_on, false, false);
+@@ -117,7 +116,7 @@
+
+ vbox->pack_start( *hbox2, false, false );
+
+- clock_mod_adj->signal_value_changed().connect( SigC::bind(mem_fun(*this,&options::clock_mod_callback),clock_mod_adj));
++ clock_mod_adj->signal_value_changed().connect( sigc::bind(mem_fun(*this,&options::clock_mod_callback),clock_mod_adj));
+
+
+ // Input Buses
+diff -Naur seq24-0.8.7-org/src/perfedit.cpp seq24-0.8.7/src/perfedit.cpp
+--- seq24-0.8.7-org/src/perfedit.cpp 2006-08-13 22:58:37.000000000 +0200
++++ seq24-0.8.7/src/perfedit.cpp 2008-05-01 21:03:49.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include "undo.xpm"
+ #include "down.xpm"
+
+-using namespace SigC;
++using namespace sigc;
+
+ perfedit::perfedit( perform *a_perf )
+ {
+@@ -99,12 +99,12 @@
+ m_table->attach( *m_button_grow, 2, 3, 3, 4, Gtk::SHRINK, Gtk::SHRINK );
+
+ m_menu_snap = manage( new Menu());
+- m_menu_snap->items().push_back(MenuElem("1/1", SigC::bind(mem_fun(*this,&perfedit::set_snap), 1 )));
+- m_menu_snap->items().push_back(MenuElem("1/2", SigC::bind(mem_fun(*this,&perfedit::set_snap), 2 )));
+- m_menu_snap->items().push_back(MenuElem("1/4", SigC::bind(mem_fun(*this,&perfedit::set_snap), 4 )));
+- m_menu_snap->items().push_back(MenuElem("1/8", SigC::bind(mem_fun(*this,&perfedit::set_snap), 8 )));
+- m_menu_snap->items().push_back(MenuElem("1/16", SigC::bind(mem_fun(*this,&perfedit::set_snap), 16 )));
+- m_menu_snap->items().push_back(MenuElem("1/32", SigC::bind(mem_fun(*this,&perfedit::set_snap), 32 )));
++ m_menu_snap->items().push_back(MenuElem("1/1", sigc::bind(mem_fun(*this,&perfedit::set_snap), 1 )));
++ m_menu_snap->items().push_back(MenuElem("1/2", sigc::bind(mem_fun(*this,&perfedit::set_snap), 2 )));
++ m_menu_snap->items().push_back(MenuElem("1/4", sigc::bind(mem_fun(*this,&perfedit::set_snap), 4 )));
++ m_menu_snap->items().push_back(MenuElem("1/8", sigc::bind(mem_fun(*this,&perfedit::set_snap), 8 )));
++ m_menu_snap->items().push_back(MenuElem("1/16", sigc::bind(mem_fun(*this,&perfedit::set_snap), 16 )));
++ m_menu_snap->items().push_back(MenuElem("1/32", sigc::bind(mem_fun(*this,&perfedit::set_snap), 32 )));
+
+
+ /* snap */
+@@ -121,11 +121,11 @@
+ m_menu_bw = manage( new Menu() );
+
+ /* bw */
+- m_menu_bw->items().push_back(MenuElem("1", SigC::bind(mem_fun(*this,&perfedit::set_bw), 1 )));
+- m_menu_bw->items().push_back(MenuElem("2", SigC::bind(mem_fun(*this,&perfedit::set_bw), 2 )));
+- m_menu_bw->items().push_back(MenuElem("4", SigC::bind(mem_fun(*this,&perfedit::set_bw), 4 )));
+- m_menu_bw->items().push_back(MenuElem("8", SigC::bind(mem_fun(*this,&perfedit::set_bw), 8 )));
+- m_menu_bw->items().push_back(MenuElem("16", SigC::bind(mem_fun(*this,&perfedit::set_bw), 16 )));
++ m_menu_bw->items().push_back(MenuElem("1", sigc::bind(mem_fun(*this,&perfedit::set_bw), 1 )));
++ m_menu_bw->items().push_back(MenuElem("2", sigc::bind(mem_fun(*this,&perfedit::set_bw), 2 )));
++ m_menu_bw->items().push_back(MenuElem("4", sigc::bind(mem_fun(*this,&perfedit::set_bw), 4 )));
++ m_menu_bw->items().push_back(MenuElem("8", sigc::bind(mem_fun(*this,&perfedit::set_bw), 8 )));
++ m_menu_bw->items().push_back(MenuElem("16", sigc::bind(mem_fun(*this,&perfedit::set_bw), 16 )));
+
+ char b[20];
+
+@@ -135,7 +135,7 @@
+
+ /* length */
+ m_menu_bpm->items().push_back(MenuElem(b,
+- SigC::bind(mem_fun(*this,&perfedit::set_bpm),
++ sigc::bind(mem_fun(*this,&perfedit::set_bpm),
+ i+1 )));
+ }
+
+diff -Naur seq24-0.8.7-org/src/perfedit.h seq24-0.8.7/src/perfedit.h
+--- seq24-0.8.7-org/src/perfedit.h 2006-08-13 22:53:33.000000000 +0200
++++ seq24-0.8.7/src/perfedit.h 2008-05-01 20:57:25.000000000 +0200
+@@ -64,7 +64,7 @@
+ #include "perftime.h"
+
+ using namespace Gtk;
+-using namespace SigC;
++using namespace sigc;
+
+ /* has a seqroll and paino roll */
+ class perfedit:public Gtk::Window
+diff -Naur seq24-0.8.7-org/src/seqedit.cpp seq24-0.8.7/src/seqedit.cpp
+--- seq24-0.8.7-org/src/seqedit.cpp 2006-05-30 16:04:52.000000000 +0200
++++ seq24-0.8.7/src/seqedit.cpp 2008-05-01 21:01:54.000000000 +0200
+@@ -283,75 +283,75 @@
+ char b[20];
+
+ /* zoom */
+- m_menu_zoom->items().push_back(MenuElem("1:1", SigC::bind(mem_fun(*this,&seqedit::set_zoom), 1 )));
+- m_menu_zoom->items().push_back(MenuElem("1:2", SigC::bind(mem_fun(*this,&seqedit::set_zoom), 2 )));
+- m_menu_zoom->items().push_back(MenuElem("1:4", SigC::bind(mem_fun(*this,&seqedit::set_zoom), 4 )));
+- m_menu_zoom->items().push_back(MenuElem("1:8", SigC::bind(mem_fun(*this,&seqedit::set_zoom), 8 )));
+- m_menu_zoom->items().push_back(MenuElem("1:16", SigC::bind(mem_fun(*this,&seqedit::set_zoom), 16 )));
+- m_menu_zoom->items().push_back(MenuElem("1:32", SigC::bind(mem_fun(*this,&seqedit::set_zoom), 32 )));
++ m_menu_zoom->items().push_back(MenuElem("1:1", sigc::bind(mem_fun(*this,&seqedit::set_zoom), 1 )));
++ m_menu_zoom->items().push_back(MenuElem("1:2", sigc::bind(mem_fun(*this,&seqedit::set_zoom), 2 )));
++ m_menu_zoom->items().push_back(MenuElem("1:4", sigc::bind(mem_fun(*this,&seqedit::set_zoom), 4 )));
++ m_menu_zoom->items().push_back(MenuElem("1:8", sigc::bind(mem_fun(*this,&seqedit::set_zoom), 8 )));
++ m_menu_zoom->items().push_back(MenuElem("1:16", sigc::bind(mem_fun(*this,&seqedit::set_zoom), 16 )));
++ m_menu_zoom->items().push_back(MenuElem("1:32", sigc::bind(mem_fun(*this,&seqedit::set_zoom), 32 )));
+
+ /* note snap */
+- m_menu_snap->items().push_back(MenuElem("1", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 4 )));
+- m_menu_snap->items().push_back(MenuElem("1/2", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 2 )));
+- m_menu_snap->items().push_back(MenuElem("1/4", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 1 )));
+- m_menu_snap->items().push_back(MenuElem("1/8", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 2 )));
+- m_menu_snap->items().push_back(MenuElem("1/16", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 4 )));
+- m_menu_snap->items().push_back(MenuElem("1/32", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 8 )));
+- m_menu_snap->items().push_back(MenuElem("1/64", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 16 )));
+- m_menu_snap->items().push_back(MenuElem("1/128", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 32 )));
++ m_menu_snap->items().push_back(MenuElem("1", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 4 )));
++ m_menu_snap->items().push_back(MenuElem("1/2", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 2 )));
++ m_menu_snap->items().push_back(MenuElem("1/4", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 1 )));
++ m_menu_snap->items().push_back(MenuElem("1/8", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 2 )));
++ m_menu_snap->items().push_back(MenuElem("1/16", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 4 )));
++ m_menu_snap->items().push_back(MenuElem("1/32", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 8 )));
++ m_menu_snap->items().push_back(MenuElem("1/64", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 16 )));
++ m_menu_snap->items().push_back(MenuElem("1/128", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 32 )));
+ m_menu_snap->items().push_back(SeparatorElem());
+- m_menu_snap->items().push_back(MenuElem("1/3", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 4 / 3 )));
+- m_menu_snap->items().push_back(MenuElem("1/6", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 2 / 3 )));
+- m_menu_snap->items().push_back(MenuElem("1/12", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 1 / 3 )));
+- m_menu_snap->items().push_back(MenuElem("1/24", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 2 / 3 )));
+- m_menu_snap->items().push_back(MenuElem("1/48", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 4 / 3 )));
+- m_menu_snap->items().push_back(MenuElem("1/96", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 8 / 3 )));
+- m_menu_snap->items().push_back(MenuElem("1/192", SigC::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 16 / 3 )));
++ m_menu_snap->items().push_back(MenuElem("1/3", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 4 / 3 )));
++ m_menu_snap->items().push_back(MenuElem("1/6", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 2 / 3 )));
++ m_menu_snap->items().push_back(MenuElem("1/12", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn * 1 / 3 )));
++ m_menu_snap->items().push_back(MenuElem("1/24", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 2 / 3 )));
++ m_menu_snap->items().push_back(MenuElem("1/48", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 4 / 3 )));
++ m_menu_snap->items().push_back(MenuElem("1/96", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 8 / 3 )));
++ m_menu_snap->items().push_back(MenuElem("1/192", sigc::bind(mem_fun(*this,&seqedit::set_snap), c_ppqn / 16 / 3 )));
+
+ /* note note_length */
+- m_menu_note_length->items().push_back(MenuElem("1", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 4 )));
+- m_menu_note_length->items().push_back(MenuElem("1/2", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 2 )));
+- m_menu_note_length->items().push_back(MenuElem("1/4", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 1 )));
+- m_menu_note_length->items().push_back(MenuElem("1/8", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 2 )));
+- m_menu_note_length->items().push_back(MenuElem("1/16", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 4 )));
+- m_menu_note_length->items().push_back(MenuElem("1/32", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 8 )));
+- m_menu_note_length->items().push_back(MenuElem("1/64", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 16 )));
+- m_menu_note_length->items().push_back(MenuElem("1/128", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 32 )));
++ m_menu_note_length->items().push_back(MenuElem("1", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 4 )));
++ m_menu_note_length->items().push_back(MenuElem("1/2", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 2 )));
++ m_menu_note_length->items().push_back(MenuElem("1/4", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 1 )));
++ m_menu_note_length->items().push_back(MenuElem("1/8", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 2 )));
++ m_menu_note_length->items().push_back(MenuElem("1/16", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 4 )));
++ m_menu_note_length->items().push_back(MenuElem("1/32", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 8 )));
++ m_menu_note_length->items().push_back(MenuElem("1/64", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 16 )));
++ m_menu_note_length->items().push_back(MenuElem("1/128", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 32 )));
+ m_menu_note_length->items().push_back(SeparatorElem());
+- m_menu_note_length->items().push_back(MenuElem("1/3", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 4 / 3 )));
+- m_menu_note_length->items().push_back(MenuElem("1/6", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 2 / 3 )));
+- m_menu_note_length->items().push_back(MenuElem("1/12", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 1 / 3 )));
+- m_menu_note_length->items().push_back(MenuElem("1/24", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 2 / 3 )));
+- m_menu_note_length->items().push_back(MenuElem("1/48", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 4 / 3 )));
+- m_menu_note_length->items().push_back(MenuElem("1/96", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 8 / 3 )));
+- m_menu_note_length->items().push_back(MenuElem("1/192", SigC::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 16 / 3 )));
++ m_menu_note_length->items().push_back(MenuElem("1/3", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 4 / 3 )));
++ m_menu_note_length->items().push_back(MenuElem("1/6", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 2 / 3 )));
++ m_menu_note_length->items().push_back(MenuElem("1/12", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn * 1 / 3 )));
++ m_menu_note_length->items().push_back(MenuElem("1/24", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 2 / 3 )));
++ m_menu_note_length->items().push_back(MenuElem("1/48", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 4 / 3 )));
++ m_menu_note_length->items().push_back(MenuElem("1/96", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 8 / 3 )));
++ m_menu_note_length->items().push_back(MenuElem("1/192", sigc::bind(mem_fun(*this,&seqedit::set_note_length), c_ppqn / 16 / 3 )));
+
+ /* Key */
+- m_menu_key->items().push_back(MenuElem( c_key_text[0], SigC::bind(mem_fun(*this,&seqedit::set_key), 0 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[1], SigC::bind(mem_fun(*this,&seqedit::set_key), 1 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[2], SigC::bind(mem_fun(*this,&seqedit::set_key), 2 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[3], SigC::bind(mem_fun(*this,&seqedit::set_key), 3 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[4], SigC::bind(mem_fun(*this,&seqedit::set_key), 4 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[5], SigC::bind(mem_fun(*this,&seqedit::set_key), 5 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[6], SigC::bind(mem_fun(*this,&seqedit::set_key), 6 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[7], SigC::bind(mem_fun(*this,&seqedit::set_key), 7 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[8], SigC::bind(mem_fun(*this,&seqedit::set_key), 8 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[9], SigC::bind(mem_fun(*this,&seqedit::set_key), 9 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[10], SigC::bind(mem_fun(*this,&seqedit::set_key), 10 )));
+- m_menu_key->items().push_back(MenuElem( c_key_text[11], SigC::bind(mem_fun(*this,&seqedit::set_key), 11 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[0], sigc::bind(mem_fun(*this,&seqedit::set_key), 0 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[1], sigc::bind(mem_fun(*this,&seqedit::set_key), 1 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[2], sigc::bind(mem_fun(*this,&seqedit::set_key), 2 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[3], sigc::bind(mem_fun(*this,&seqedit::set_key), 3 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[4], sigc::bind(mem_fun(*this,&seqedit::set_key), 4 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[5], sigc::bind(mem_fun(*this,&seqedit::set_key), 5 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[6], sigc::bind(mem_fun(*this,&seqedit::set_key), 6 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[7], sigc::bind(mem_fun(*this,&seqedit::set_key), 7 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[8], sigc::bind(mem_fun(*this,&seqedit::set_key), 8 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[9], sigc::bind(mem_fun(*this,&seqedit::set_key), 9 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[10], sigc::bind(mem_fun(*this,&seqedit::set_key), 10 )));
++ m_menu_key->items().push_back(MenuElem( c_key_text[11], sigc::bind(mem_fun(*this,&seqedit::set_key), 11 )));
+
+ /* bw */
+- m_menu_bw->items().push_back(MenuElem("1", SigC::bind(mem_fun(*this,&seqedit::set_bw), 1 )));
+- m_menu_bw->items().push_back(MenuElem("2", SigC::bind(mem_fun(*this,&seqedit::set_bw), 2 )));
+- m_menu_bw->items().push_back(MenuElem("4", SigC::bind(mem_fun(*this,&seqedit::set_bw), 4 )));
+- m_menu_bw->items().push_back(MenuElem("8", SigC::bind(mem_fun(*this,&seqedit::set_bw), 8 )));
+- m_menu_bw->items().push_back(MenuElem("16", SigC::bind(mem_fun(*this,&seqedit::set_bw), 16 )));
++ m_menu_bw->items().push_back(MenuElem("1", sigc::bind(mem_fun(*this,&seqedit::set_bw), 1 )));
++ m_menu_bw->items().push_back(MenuElem("2", sigc::bind(mem_fun(*this,&seqedit::set_bw), 2 )));
++ m_menu_bw->items().push_back(MenuElem("4", sigc::bind(mem_fun(*this,&seqedit::set_bw), 4 )));
++ m_menu_bw->items().push_back(MenuElem("8", sigc::bind(mem_fun(*this,&seqedit::set_bw), 8 )));
++ m_menu_bw->items().push_back(MenuElem("16", sigc::bind(mem_fun(*this,&seqedit::set_bw), 16 )));
+
+
+ /* music scale */
+- m_menu_scale->items().push_back(MenuElem(c_scales_text[0], SigC::bind(mem_fun(*this,&seqedit::set_scale), c_scale_off )));
+- m_menu_scale->items().push_back(MenuElem(c_scales_text[1], SigC::bind(mem_fun(*this,&seqedit::set_scale), c_scale_major )));
+- m_menu_scale->items().push_back(MenuElem(c_scales_text[2], SigC::bind(mem_fun(*this,&seqedit::set_scale), c_scale_minor )));
++ m_menu_scale->items().push_back(MenuElem(c_scales_text[0], sigc::bind(mem_fun(*this,&seqedit::set_scale), c_scale_off )));
++ m_menu_scale->items().push_back(MenuElem(c_scales_text[1], sigc::bind(mem_fun(*this,&seqedit::set_scale), c_scale_major )));
++ m_menu_scale->items().push_back(MenuElem(c_scales_text[2], sigc::bind(mem_fun(*this,&seqedit::set_scale), c_scale_minor )));
+
+ /* midi channel menu */
+ for( int i=0; i<16; i++ ){
+@@ -360,16 +360,16 @@
+
+ /* length */
+ m_menu_length->items().push_back(MenuElem(b,
+- SigC::bind(mem_fun(*this,&seqedit::set_measures),
++ sigc::bind(mem_fun(*this,&seqedit::set_measures),
+ i+1 )));
+ /* length */
+ m_menu_bpm->items().push_back(MenuElem(b,
+- SigC::bind(mem_fun(*this,&seqedit::set_bpm),
++ sigc::bind(mem_fun(*this,&seqedit::set_bpm),
+ i+1 )));
+ }
+
+- m_menu_length->items().push_back(MenuElem("32", SigC::bind(mem_fun(*this,&seqedit::set_measures), 32 )));
+- m_menu_length->items().push_back(MenuElem("64", SigC::bind(mem_fun(*this,&seqedit::set_measures), 64 )));
++ m_menu_length->items().push_back(MenuElem("32", sigc::bind(mem_fun(*this,&seqedit::set_measures), 32 )));
++ m_menu_length->items().push_back(MenuElem("64", sigc::bind(mem_fun(*this,&seqedit::set_measures), 64 )));
+
+
+
+@@ -394,29 +394,29 @@
+ Menu *holder2;
+
+ holder = manage( new Menu());
+- holder->items().push_back( MenuElem( "All Notes", SigC::bind(mem_fun(*this,&seqedit::do_action), select_all_notes,0 )));
+- holder->items().push_back( MenuElem( "Inverse Notes", SigC::bind(mem_fun(*this,&seqedit::do_action), select_inverse_notes,0 )));
++ holder->items().push_back( MenuElem( "All Notes", sigc::bind(mem_fun(*this,&seqedit::do_action), select_all_notes,0 )));
++ holder->items().push_back( MenuElem( "Inverse Notes", sigc::bind(mem_fun(*this,&seqedit::do_action), select_inverse_notes,0 )));
+
+ if ( m_editing_status != EVENT_NOTE_ON &&
+ m_editing_status != EVENT_NOTE_OFF ){
+
+ holder->items().push_back( SeparatorElem( ));
+- holder->items().push_back( MenuElem( "All Events", SigC::bind(mem_fun(*this,&seqedit::do_action), select_all_events,0 )));
+- holder->items().push_back( MenuElem( "Inverse Events", SigC::bind(mem_fun(*this,&seqedit::do_action), select_inverse_events,0 )));
++ holder->items().push_back( MenuElem( "All Events", sigc::bind(mem_fun(*this,&seqedit::do_action), select_all_events,0 )));
++ holder->items().push_back( MenuElem( "Inverse Events", sigc::bind(mem_fun(*this,&seqedit::do_action), select_inverse_events,0 )));
+ }
+
+ m_menu_tools->items().push_back( MenuElem( "Select", *holder ));
+
+ holder = manage( new Menu());
+- holder->items().push_back( MenuElem( "Quantize Selected Notes", SigC::bind(mem_fun(*this,&seqedit::do_action), quantize_notes,0 )));
+- holder->items().push_back( MenuElem( "Tighten Selected Notes", SigC::bind(mem_fun(*this,&seqedit::do_action), tighten_notes,0 )));
++ holder->items().push_back( MenuElem( "Quantize Selected Notes", sigc::bind(mem_fun(*this,&seqedit::do_action), quantize_notes,0 )));
++ holder->items().push_back( MenuElem( "Tighten Selected Notes", sigc::bind(mem_fun(*this,&seqedit::do_action), tighten_notes,0 )));
+
+ if ( m_editing_status != EVENT_NOTE_ON &&
+ m_editing_status != EVENT_NOTE_OFF ){
+
+ holder->items().push_back( SeparatorElem( ));
+- holder->items().push_back( MenuElem( "Quantize Selected Events", SigC::bind(mem_fun(*this,&seqedit::do_action), quantize_events,0 )));
+- holder->items().push_back( MenuElem( "Tighten Selected Events", SigC::bind(mem_fun(*this,&seqedit::do_action), tighten_events,0 )));
++ holder->items().push_back( MenuElem( "Quantize Selected Events", sigc::bind(mem_fun(*this,&seqedit::do_action), quantize_events,0 )));
++ holder->items().push_back( MenuElem( "Tighten Selected Events", sigc::bind(mem_fun(*this,&seqedit::do_action), tighten_events,0 )));
+
+ }
+ m_menu_tools->items().push_back( MenuElem( "Modify Time", *holder ));
+@@ -432,7 +432,7 @@
+
+ if ( i!=0 ){
+ sprintf( num, "%+d [%s]", i, c_interval_text[ abs(i) ] );
+- holder2->items().push_front( MenuElem( num, SigC::bind(mem_fun(*this,&seqedit::do_action), transpose, i )));
++ holder2->items().push_front( MenuElem( num, sigc::bind(mem_fun(*this,&seqedit::do_action), transpose, i )));
+ }
+ }
+
+@@ -445,7 +445,7 @@
+
+ if ( i!=0 ){
+ sprintf( num, "%+d [%s]", (i<0) ? i-1 : i+1, c_chord_text[ abs(i) ] );
+- holder2->items().push_front( MenuElem( num, SigC::bind(mem_fun(*this,&seqedit::do_action), transpose_h, i )));
++ holder2->items().push_front( MenuElem( num, sigc::bind(mem_fun(*this,&seqedit::do_action), transpose_h, i )));
+ }
+ }
+
+@@ -574,7 +574,7 @@
+ /* beats per measure */
+ m_button_bpm = manage( new Button());
+ m_button_bpm->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( down_xpm ))));
+- m_button_bpm->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_bpm ));
++ m_button_bpm->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_bpm ));
+ m_tooltips->set_tip( *m_button_bpm, "Time Signature. Beats per Measure" );
+ m_entry_bpm = manage( new Entry());
+ m_entry_bpm->set_width_chars(2);
+@@ -588,7 +588,7 @@
+ /* beat width */
+ m_button_bw = manage( new Button());
+ m_button_bw->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( down_xpm ))));
+- m_button_bw->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_bw ));
++ m_button_bw->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_bw ));
+ m_tooltips->set_tip( *m_button_bw, "Time Signature. Length of Beat" );
+ m_entry_bw = manage( new Entry());
+ m_entry_bw->set_width_chars(2);
+@@ -601,7 +601,7 @@
+ /* length */
+ m_button_length = manage( new Button());
+ m_button_length->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( length_xpm ))));
+- m_button_length->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_length ));
++ m_button_length->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_length ));
+ m_tooltips->set_tip( *m_button_length, "Sequence length in Bars." );
+ m_entry_length = manage( new Entry());
+ m_entry_length->set_width_chars(2);
+@@ -664,7 +664,7 @@
+ /* snap */
+ m_button_snap = manage( new Button());
+ m_button_snap->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( snap_xpm ))));
+- m_button_snap->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_snap ));
++ m_button_snap->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_snap ));
+ m_tooltips->set_tip( *m_button_snap, "Grid snap." );
+ m_entry_snap = manage( new Entry());
+ m_entry_snap->set_width_chars(5);
+@@ -677,7 +677,7 @@
+ /* note_length */
+ m_button_note_length = manage( new Button());
+ m_button_note_length->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( note_length_xpm ))));
+- m_button_note_length->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_note_length ));
++ m_button_note_length->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_note_length ));
+ m_tooltips->set_tip( *m_button_note_length, "Note Length." );
+ m_entry_note_length = manage( new Entry());
+ m_entry_note_length->set_width_chars(5);
+@@ -690,7 +690,7 @@
+ /* zoom */
+ m_button_zoom = manage( new Button());
+ m_button_zoom->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( zoom_xpm ))));
+- m_button_zoom->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_zoom ));
++ m_button_zoom->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_zoom ));
+ m_tooltips->set_tip( *m_button_zoom, "Zoom. Pixels to Ticks" );
+ m_entry_zoom = manage( new Entry());
+ m_entry_zoom->set_width_chars(4);
+@@ -705,7 +705,7 @@
+ /* key */
+ m_button_key = manage( new Button());
+ m_button_key->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( key_xpm ))));
+- m_button_key->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_key ));
++ m_button_key->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_key ));
+ m_tooltips->set_tip( *m_button_key, "Key of Sequence" );
+ m_entry_key = manage( new Entry());
+ m_entry_key->set_width_chars(5);
+@@ -717,7 +717,7 @@
+ /* music scale */
+ m_button_scale = manage( new Button());
+ m_button_scale->add( *manage( new Image(Gdk::Pixbuf::create_from_xpm_data( scale_xpm ))));
+- m_button_scale->signal_clicked().connect( SigC::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_scale ));
++ m_button_scale->signal_clicked().connect( sigc::bind<Menu *>( mem_fun( *this, &seqedit::popup_menu), m_menu_scale ));
+ m_tooltips->set_tip( *m_button_scale, "Musical Scale" );
+ m_entry_scale = manage( new Entry());
+ m_entry_scale->set_width_chars(5);
+@@ -745,17 +745,17 @@
+ #if 0
+ /* Select */
+ m_radio_select = manage( new RadioButton( "Sel", true ));
+- m_radio_select->signal_clicked().connect( SigC::bind(mem_fun( *this, &seqedit::mouse_action ), e_action_select ));
++ m_radio_select->signal_clicked().connect( sigc::bind(mem_fun( *this, &seqedit::mouse_action ), e_action_select ));
+ m_hbox3->pack_start( *m_radio_select, false, false );
+
+ /* Draw */
+ m_radio_draw = manage( new RadioButton( "Draw" ));
+- m_radio_draw->signal_clicked().connect( SigC::bind(mem_fun( *this, &seqedit::mouse_action ), e_action_draw ));
++ m_radio_draw->signal_clicked().connect( sigc::bind(mem_fun( *this, &seqedit::mouse_action ), e_action_draw ));
+ m_hbox3->pack_start( *m_radio_draw, false, false );
+
+ /* Grow */
+ m_radio_grow = manage( new RadioButton( "Grow" ));
+- m_radio_grow->signal_clicked().connect( SigC::bind(mem_fun( *this, &seqedit::mouse_action ), e_action_grow ));
++ m_radio_grow->signal_clicked().connect( sigc::bind(mem_fun( *this, &seqedit::mouse_action ), e_action_grow ));
+ m_hbox3->pack_start( *m_radio_grow, false, false );
+
+ /* Stretch */
+@@ -800,7 +800,7 @@
+ mastermidibus *masterbus = m_mainperf->get_master_midi_bus();
+ for ( int i=0; i< masterbus->get_num_out_buses(); i++ ){
+ m_menu_midibus->items().push_back(MenuElem(masterbus->get_midi_out_bus_name(i),
+- SigC::bind(mem_fun(*this,&seqedit::set_midi_bus), i)));
++ sigc::bind(mem_fun(*this,&seqedit::set_midi_bus), i)));
+ }
+
+ m_menu_midibus->popup(0,0);
+@@ -832,7 +832,7 @@
+ string(")") );
+ }
+ m_menu_midich->items().push_back(MenuElem(name,
+- SigC::bind(mem_fun(*this,&seqedit::set_midi_channel),
++ sigc::bind(mem_fun(*this,&seqedit::set_midi_channel),
+ i )));
+ }
+
+@@ -853,7 +853,7 @@
+ m_menu_sequences = manage( new Menu());
+
+ m_menu_sequences->items().push_back(MenuElem("Off",
+- SigC::bind(mem_fun(*this, &seqedit::set_background_sequence), -1)));
++ sigc::bind(mem_fun(*this, &seqedit::set_background_sequence), -1)));
+ m_menu_sequences->items().push_back( SeparatorElem( ));
+
+ for ( int ss=0; ss<c_max_sets; ++ss ){
+@@ -881,7 +881,7 @@
+ sprintf( name, "[%d] %.13s", i, seq->get_name() );
+
+ menu_ss->items().push_back(MenuElem(name,
+- SigC::bind(mem_fun(*this,&seqedit::set_background_sequence), i)));
++ sigc::bind(mem_fun(*this,&seqedit::set_background_sequence), i)));
+
+ }
+ }
+@@ -964,29 +964,29 @@
+
+ m_menu_data->items().push_back( ImageMenuElem( "Note On Velocity",
+ *create_menu_image( note_on ),
+- SigC::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_NOTE_ON, 0 )));
++ sigc::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_NOTE_ON, 0 )));
+
+ m_menu_data->items().push_back( SeparatorElem( ));
+
+ m_menu_data->items().push_back( ImageMenuElem( "Note Off Velocity",
+ *create_menu_image( note_off ),
+- SigC::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_NOTE_OFF, 0 )));
++ sigc::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_NOTE_OFF, 0 )));
+
+ m_menu_data->items().push_back( ImageMenuElem( "AfterTouch",
+ *create_menu_image( aftertouch ),
+- SigC::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_AFTERTOUCH, 0 )));
++ sigc::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_AFTERTOUCH, 0 )));
+
+ m_menu_data->items().push_back( ImageMenuElem( "Program Change",
+ *create_menu_image( program_change ),
+- SigC::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_PROGRAM_CHANGE, 0 )));
++ sigc::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_PROGRAM_CHANGE, 0 )));
+
+ m_menu_data->items().push_back( ImageMenuElem( "Channel Pressure",
+ *create_menu_image( channel_pressure ),
+- SigC::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_CHANNEL_PRESSURE, 0 )));
++ sigc::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_CHANNEL_PRESSURE, 0 )));
+
+ m_menu_data->items().push_back( ImageMenuElem( "Pitch Wheel",
+ *create_menu_image( pitch_wheel ),
+- SigC::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_PITCH_WHEEL , 0 )));
++ sigc::bind(mem_fun(*this,&seqedit::set_data_type), (unsigned char) EVENT_PITCH_WHEEL , 0 )));
+
+ m_menu_data->items().push_back( SeparatorElem( ));
+
+@@ -1007,7 +1007,7 @@
+
+ menu_cc->items().push_back( ImageMenuElem( controller_name,
+ *create_menu_image( ccs[i*16+j]),
+- SigC::bind(mem_fun(*this,&seqedit::set_data_type),
++ sigc::bind(mem_fun(*this,&seqedit::set_data_type),
+ (unsigned char) EVENT_CONTROL_CHANGE, i*16+j)));
+ }
+ m_menu_data->items().push_back( MenuElem( string(b), *menu_cc ));
+diff -Naur seq24-0.8.7-org/src/seqmenu.cpp seq24-0.8.7/src/seqmenu.cpp
+--- seq24-0.8.7-org/src/seqmenu.cpp 2006-05-30 15:12:05.000000000 +0200
++++ seq24-0.8.7/src/seqmenu.cpp 2008-05-01 21:16:37.000000000 +0200
+@@ -104,7 +104,7 @@
+ }
+
+ menu_channels->items().push_back(MenuElem(name,
+- SigC::bind(mem_fun(*this,&seqmenu::set_bus_and_midi_channel),
++ sigc::bind(mem_fun(*this,&seqmenu::set_bus_and_midi_channel),
+ i, j )));
+ }
+ }
Modified: trunk/overlays/proaudio/media-sound/seq24/seq24-0.8.7.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/seq24/seq24-0.8.7.ebuild 2008-05-02 14:30:27 UTC (rev 1208)
+++ trunk/overlays/proaudio/media-sound/seq24/seq24-0.8.7.ebuild 2008-05-03 08:35:41 UTC (rev 1209)
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,6 +15,7 @@
DEPEND=">=media-libs/alsa-lib-0.9.0
>=dev-cpp/gtkmm-2.4
+ >=dev-libs/libsigc++-2.0
jack? ( >=media-sound/jack-audio-connection-kit-0.90.0 )
lash? ( >=media-sound/lash-0.5.0 )"
#cairo? ( x11-libs/cairo )"
@@ -31,6 +32,11 @@
epatch "${FILESDIR}/${P}.olivier.patch"
#epatch "${FILESDIR}/${P}.olivier2.patch"
fi
+
+ # fix sigc++ >= 2.2 compile error
+ if has_version ">=dev-libs/libsigc++-2.2"; then
+ epatch "${FILESDIR}/${P}-sigc22_fix.patch"
+ fi
}
src_compile() {