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

MCP: more of the same

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11965 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-13 20:39:59 +00:00
parent ae09d046c1
commit 565be46ea1
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/surfaces/mackie/gui.cc
View file

@ -187,6 +187,7 @@ MackieControlProtocolGUI::rebuild_function_key_editor ()
action_renderer->property_editable() = true; action_renderer->property_editable() = true;
action_renderer->property_text_column() = 0; action_renderer->property_text_column() = 0;
action_renderer->property_has_entry() = false; action_renderer->property_has_entry() = false;
action_renderer->signal_edited().connect (sigc::mem_fun(*this, &MackieControlProtocolGUI::action_changed));
TreeViewColumn* col; TreeViewColumn* col;
@ -222,24 +223,41 @@ MackieControlProtocolGUI::rebuild_function_key_editor ()
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F1"; row[function_key_columns.name] = "F1";
row[function_key_columns.number] = 0;
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F2"; row[function_key_columns.name] = "F2";
row[function_key_columns.number] = 1;
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F3"; row[function_key_columns.name] = "F3";
row[function_key_columns.number] = 2;
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F4"; row[function_key_columns.name] = "F4";
row[function_key_columns.number] = 3;
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F5"; row[function_key_columns.name] = "F5";
row[function_key_columns.number] = 4;
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F6"; row[function_key_columns.name] = "F6";
row[function_key_columns.number] = 5;
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F7"; row[function_key_columns.name] = "F7";
row[function_key_columns.number] = 6;
row = *(function_key_model->append()); row = *(function_key_model->append());
row[function_key_columns.name] = "F8"; row[function_key_columns.name] = "F8";
row[function_key_columns.number] = 7;
function_key_editor.set_model (function_key_model); function_key_editor.set_model (function_key_model);
} }
void
MackieControlProtocolGUI::action_changed (const Glib::ustring &sPath, const Glib::ustring &text)
{
Gtk::TreePath path(sPath);
Gtk::TreeModel::iterator row = function_key_model->get_iter(path);
cerr << sPath << " changed to " << text << endl;
}
void void
MackieControlProtocolGUI::surface_combo_changed () MackieControlProtocolGUI::surface_combo_changed ()
{ {

3
libs/surfaces/mackie/gui.h
View file

@ -52,6 +52,7 @@ class MackieControlProtocolGUI : public Gtk::Notebook
struct FunctionKeyColumns : public Gtk::TreeModel::ColumnRecord { struct FunctionKeyColumns : public Gtk::TreeModel::ColumnRecord {
FunctionKeyColumns() { FunctionKeyColumns() {
add (name); add (name);
add (number);
add (plain); add (plain);
add (shift); add (shift);
add (control); add (control);
@ -60,6 +61,7 @@ class MackieControlProtocolGUI : public Gtk::Notebook
add (shiftcontrol); add (shiftcontrol);
}; };
Gtk::TreeModelColumn<std::string> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<uint32_t> number;
Gtk::TreeModelColumn<std::string> plain; Gtk::TreeModelColumn<std::string> plain;
Gtk::TreeModelColumn<std::string> shift; Gtk::TreeModelColumn<std::string> shift;
Gtk::TreeModelColumn<std::string> control; Gtk::TreeModelColumn<std::string> control;
@ -77,5 +79,6 @@ class MackieControlProtocolGUI : public Gtk::Notebook
Glib::RefPtr<Gtk::TreeStore> available_action_model; Glib::RefPtr<Gtk::TreeStore> available_action_model;
void rebuild_function_key_editor (); void rebuild_function_key_editor ();
void action_changed (const Glib::ustring &sPath, const Glib::ustring &text);
}; };

2
libs/surfaces/mackie/strip.cc
View file

@ -505,7 +505,7 @@ Strip::do_parameter_display (AutomationType type, float val)
case PanAzimuthAutomation: case PanAzimuthAutomation:
if (_route) { if (_route) {
boost::shared_ptr<Pannable> p = _route->pannable(); boost::shared_ptr<Pannable> p = _route->pannable();
if (p) { if (p && p->panner()) {
string str = p->panner()->value_as_string (p->pan_azimuth_control); string str = p->panner()->value_as_string (p->pan_azimuth_control);
_surface->write (display (1, str)); _surface->write (display (1, str));
} }