smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

merge 12607:12717 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12718 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-14 01:09:40 +00:00
parent 2b1fdfe815
commit 129dcd7f97
130 changed files with 2870 additions and 1065 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/patch_change_dialog.h
View file

@ -28,6 +28,7 @@
namespace ARDOUR {
class BeatsFramesConverter;
class Session;
class InstrumentInfo;
}
namespace MIDI {
@ -43,8 +44,7 @@ public:
const ARDOUR::BeatsFramesConverter *,
ARDOUR::Session *,
Evoral::PatchChange<Evoral::MusicalTime> const &,
std::string const &,
std::string const &,
ARDOUR::InstrumentInfo&,
const Gtk::BuiltinStockID &
);
@ -61,11 +61,8 @@ private:
void bank_changed ();
void program_changed ();
MIDI::Name::ChannelNameSet::PatchBanks const * get_banks ();
const ARDOUR::BeatsFramesConverter* _time_converter;
std::string _model_name;
std::string _custom_device_mode;
ARDOUR::InstrumentInfo& _info;
AudioClock _time;
Gtk::SpinButton _channel;
Gtk::SpinButton _program;
@ -75,4 +72,7 @@ private:
boost::shared_ptr<MIDI::Name::PatchBank> _current_patch_bank;
bool _ignore_signals;
void instrument_info_changed ();
PBD::ScopedConnection _info_changed_connection;
};