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 12436:12607 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12608 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-08 14:03:30 +00:00
parent 6ef90ffe5c
commit f228d2c68e
86 changed files with 6512 additions and 4626 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour3_ui_default.conf
View file

@ -73,6 +73,8 @@
<Option name="midi note velocity text" value="f4f214bc"/>
<Option name="midi patch change fill" value="0000ffa0"/>
<Option name="midi patch change outline" value="a7a7d4ff"/>
<Option name="midi patch change inactive channel fill" value="00000000"/>
<Option name="midi patch change inactive channel outline" value="222222ff"/>
<Option name="midi sysex fill" value="f1e139a0"/>
<Option name="midi sysex outline" value="a7a7d4ff"/>
<Option name="midi select rect fill" value="8888ff88"/>

2
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -243,6 +243,8 @@ ARDOUR_UI::unload_session (bool hide_stuff)
delete _session;
_session = 0;
session_loaded = false;
update_buffer_load ();
return 0;

10
gtk2_ardour/canvas-note.cc
View file

@ -22,11 +22,17 @@ CanvasNote::CanvasNote (MidiRegionView& region,
bool
CanvasNote::on_event(GdkEvent* ev)
{
bool r = true;
if (!CanvasNoteEvent::on_event (ev)) {
return _region.get_time_axis_view().editor().canvas_note_event (ev, this);
r = _region.get_time_axis_view().editor().canvas_note_event (ev, this);
}
return true;
if (ev->type == GDK_BUTTON_RELEASE) {
_region.note_button_release ();
}
return r;
}
void

11
gtk2_ardour/canvas_patch_change.cc
View file

@ -46,13 +46,18 @@ CanvasPatchChange::CanvasPatchChange(
double y,
string& model_name,
string& custom_device_mode,
ARDOUR::MidiModel::PatchChangePtr patch)
ARDOUR::MidiModel::PatchChangePtr patch,
bool active_channel)
: CanvasFlag(
region,
parent,
height,
ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get(),
ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get(),
active_channel ?
ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get() :
ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelOutline.get(),
active_channel ?
ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get() :
ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelFill.get(),
x,
y)
, _model_name(model_name)

3
gtk2_ardour/canvas_patch_change.h
View file

@ -45,7 +45,8 @@ public:
double y,
string& model_name,
string& custom_device_mode,
ARDOUR::MidiModel::PatchChangePtr patch
ARDOUR::MidiModel::PatchChangePtr patch,
bool
);
virtual ~CanvasPatchChange();

2
gtk2_ardour/canvas_vars.h
View file

@ -67,6 +67,8 @@ CANVAS_VARIABLE(canvasvar_MidiNoteSelected, "midi note selected")
CANVAS_VARIABLE(canvasvar_MidiNoteVelocityText, "midi note velocity text")
CANVAS_VARIABLE(canvasvar_MidiPatchChangeFill, "midi patch change fill")
CANVAS_VARIABLE(canvasvar_MidiPatchChangeOutline, "midi patch change outline")
CANVAS_VARIABLE(canvasvar_MidiPatchChangeInactiveChannelFill, "midi patch change inactive channel fill")
CANVAS_VARIABLE(canvasvar_MidiPatchChangeInactiveChannelOutline, "midi patch change inactive channel outline")
CANVAS_VARIABLE(canvasvar_MidiSysExFill, "midi sysex fill")
CANVAS_VARIABLE(canvasvar_MidiSysExOutline, "midi sysex outline")
CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")

18
gtk2_ardour/edit_note_dialog.cc
View file

@ -20,6 +20,8 @@
#include <gtkmm/stock.h>
#include <gtkmm/table.h>
#include "gtkmm2ext/utils.h"
#include "canvas-note-event.h"
#include "edit_note_dialog.h"
#include "midi_region_view.h"
@ -27,6 +29,7 @@
#include "i18n.h"
using namespace Gtk;
using namespace Gtkmm2ext;
/**
* EditNoteDialog constructor.
@ -46,8 +49,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
int r = 0;
Label* l = manage (new Label (_("Channel")));
l->set_alignment (0, 0.5);
Label* l = manage (left_aligned_label (_("Channel")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_channel, 1, 2, r, r + 1);
++r;
@ -56,8 +58,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
_channel.set_increments (1, 2);
_channel.set_value (ev->note()->channel () + 1);
l = manage (new Label (_("Pitch")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Pitch")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_pitch, 1, 2, r, r + 1);
++r;
@ -66,8 +67,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
_pitch.set_increments (1, 10);
_pitch.set_value (ev->note()->note ());
l = manage (new Label (_("Velocity")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Velocity")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_velocity, 1, 2, r, r + 1);
++r;
@ -76,8 +76,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
_velocity.set_increments (1, 10);
_velocity.set_value (ev->note()->velocity ());
l = manage (new Label (_("Time")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Time")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_time_clock, 1, 2, r, r + 1);
++r;
@ -86,8 +85,7 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, Gnome::Canvas::CanvasNoteEve
_time_clock.set_mode (AudioClock::BBT);
_time_clock.set (_region_view->source_relative_time_converter().to (ev->note()->time ()), true);
l = manage (new Label (_("Length")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Length")));
table->attach (*l, 0, 1, r, r + 1);
table->attach (_length_clock, 1, 2, r, r + 1);
++r;

2
gtk2_ardour/editor.h
View file

@ -1944,8 +1944,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
*/
RegionView* entered_regionview;
void ensure_entered_track_selected (bool op_acts_on_objects = false);
bool clear_entered_track;
bool left_track_canvas (GdkEventCrossing*);
bool entered_track_canvas (GdkEventCrossing*);

1
gtk2_ardour/editor_keys.cc
View file

@ -87,6 +87,5 @@ Editor::keyboard_selection_begin ()
void
Editor::keyboard_paste ()
{
ensure_entered_track_selected (true);
paste (1);
}

37
gtk2_ardour/editor_ops.cc
View file

@ -1337,9 +1337,9 @@ Editor::temporal_zoom_step (bool coarser)
nfpu = frames_per_unit;
if (coarser) {
nfpu *= 1.61803399;
nfpu = min (9e6, nfpu * 1.61803399);
} else {
nfpu = max(1.0,(nfpu/1.61803399));
nfpu = max (1.0, nfpu / 1.61803399);
}
temporal_zoom (nfpu);
@ -4171,12 +4171,15 @@ Editor::paste_internal (framepos_t position, float times)
/* get everything in the correct order */
if (!selection->tracks.empty()) {
/* there are some selected tracks, so paste to them */
if (_edit_point == Editing::EditAtMouse && entered_track) {
/* With the mouse edit point, paste onto the track under the mouse */
ts.push_back (entered_track);
} else if (!selection->tracks.empty()) {
/* Otherwise, if there are some selected tracks, paste to them */
ts = selection->tracks.filter_to_unique_playlists ();
sort_track_selection (ts);
} else if (_last_cut_copy_source_track) {
/* otherwise paste to the track that the cut/copy came from;
/* Otherwise paste to the track that the cut/copy came from;
see discussion in mantis #3333.
*/
ts.push_back (_last_cut_copy_source_track);
@ -5388,24 +5391,6 @@ Editor::split_region ()
split_regions_at (where, rs);
}
void
Editor::ensure_entered_track_selected (bool op_really_wants_one_track_if_none_are_selected)
{
if (entered_track && mouse_mode == MouseObject) {
if (!selection->tracks.empty()) {
if (!selection->selected (entered_track)) {
selection->add (entered_track);
}
} else {
/* there is no selection, but this operation requires/prefers selected objects */
if (op_really_wants_one_track_if_none_are_selected) {
selection->set (entered_track);
}
}
}
}
struct EditorOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
/* use of ">" forces the correct sort order */
@ -6080,8 +6065,7 @@ Editor::close_region_gaps ()
Table table (2, 3);
table.set_spacings (12);
table.set_border_width (12);
Label* l = manage (new Label (_("Crossfade length")));
l->set_alignment (0, 0.5);
Label* l = manage (left_aligned_label (_("Crossfade length")));
table.attach (*l, 0, 1, 0, 1);
SpinButton spin_crossfade (1, 0);
@ -6092,8 +6076,7 @@ Editor::close_region_gaps ()
table.attach (*manage (new Label (_("ms"))), 2, 3, 0, 1);
l = manage (new Label (_("Pull-back length")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Pull-back length")));
table.attach (*l, 0, 1, 1, 2);
SpinButton spin_pullback (1, 0);

13
gtk2_ardour/editor_selection.cc
View file

@ -1036,19 +1036,6 @@ Editor::sensitize_all_region_actions (bool s)
void
Editor::sensitize_the_right_region_actions ()
{
if ((mouse_mode == MouseRange) || (mouse_mode != MouseObject && _join_object_range_state == JOIN_OBJECT_RANGE_RANGE)) {
sensitize_all_region_actions (false);
if (!selection->time.empty()) {
_region_actions->get_action("split-region")->set_sensitive (true);
}
return;
} else if (mouse_mode != MouseObject) {
sensitize_all_region_actions (false);
return;
}
/* We get here if we are in Object mode */
RegionSelection rs = get_regions_from_selection_and_entered ();
sensitize_all_region_actions (!rs.empty ());

2
gtk2_ardour/editor_timefx.cc
View file

@ -308,6 +308,8 @@ Editor::time_fx (RegionList& regions, float val, bool pitching)
gtk_main_iteration ();
}
pthread_join (current_timefx->request.thread, 0);
current_timefx->hide ();
return current_timefx->status;
}

53
gtk2_ardour/engine_dialog.cc
View file

@ -180,41 +180,35 @@ EngineControl::EngineControl ()
row = 0;
label = manage (new Label (_("Driver:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Driver:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (driver_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
device_label.set_text (_("Audio Interface:"));
device_label.set_alignment (0, 0.5);
basic_packer.attach (device_label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
label = manage (left_aligned_label (_("Audio Interface:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (interface_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
label = manage (new Label (_("Sample rate:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Sample rate:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (sample_rate_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
label = manage (new Label (_("Buffer size:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Buffer size:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
#ifndef __APPLE__
label = manage (new Label (_("Number of buffers:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Number of buffers:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
periods_spinner.set_value (2);
row++;
#endif
label = manage (new Label (_("Approximate latency:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Approximate latency:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (latency_label, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
@ -227,8 +221,7 @@ EngineControl::EngineControl ()
/* no audio mode with CoreAudio, its duplex or nuthin' */
#ifndef __APPLE__
label = manage (new Label (_("Audio mode:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Audio mode:")));
basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
row++;
@ -314,21 +307,18 @@ EngineControl::EngineControl ()
++row;
#endif /* PROVIDE_TOO_MANY_OPTIONS */
label = manage (new Label (_("Number of ports:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Number of ports:")));
options_packer.attach (ports_spinner, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
label = manage (new Label (_("MIDI driver:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("MIDI driver:")));
options_packer.attach (midi_driver_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
#ifndef __APPLE__
label = manage (new Label (_("Dither:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Dither:")));
options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
@ -345,9 +335,8 @@ EngineControl::EngineControl ()
serverpath_combo.set_active_text (server_strings.front());
if (server_strings.size() > 1) {
label = manage (new Label (_("Server:")));
label = manage (left_aligned_label (_("Server:")));
options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
label->set_alignment (0.0, 0.5);
options_packer.attach (serverpath_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
++row;
}
@ -358,31 +347,25 @@ EngineControl::EngineControl ()
row = 0;
#ifndef __APPLE__
label = manage (new Label (_("Input device:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Input device:")));
device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
device_packer.attach (input_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
++row;
label = manage (new Label (_("Output device:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Output device:")));
device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
device_packer.attach (output_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
++row;
#endif
label = manage (new Label (_("Hardware input latency:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Hardware input latency:")));
device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
device_packer.attach (input_latency, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
label = manage (new Label (_("samples")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("samples")));
device_packer.attach (*label, 2, 3, row, row+1, FILL|EXPAND, (AttachOptions) 0);
++row;
label = manage (new Label (_("Hardware output latency:")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("Hardware output latency:")));
device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
device_packer.attach (output_latency, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
label = manage (new Label (_("samples")));
label->set_alignment (0, 0.5);
label = manage (left_aligned_label (_("samples")));
device_packer.attach (*label, 2, 3, row, row+1, FILL|EXPAND, (AttachOptions) 0);
++row;

166
gtk2_ardour/midi_region_view.cc
View file

@ -61,6 +61,7 @@
#include "midi_streamview.h"
#include "midi_time_axis.h"
#include "midi_util.h"
#include "midi_velocity_dialog.h"
#include "mouse_cursors.h"
#include "note_player.h"
#include "public_editor.h"
@ -109,6 +110,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
, _last_event_y (0)
, pre_enter_cursor (0)
, pre_press_cursor (0)
, _note_player (0)
{
_note_group->raise_to_top();
PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
@ -149,6 +151,7 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView &
, _last_event_y (0)
, pre_enter_cursor (0)
, pre_press_cursor (0)
, _note_player (0)
{
_note_group->raise_to_top();
PublicEditor::DropDownKeys.connect (sigc::mem_fun (*this, &MidiRegionView::drop_down_keys));
@ -197,6 +200,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other)
, _last_event_y (0)
, pre_enter_cursor (0)
, pre_press_cursor (0)
, _note_player (0)
{
Gdk::Color c;
int r,g,b,a;
@ -231,6 +235,7 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr<M
, _last_event_y (0)
, pre_enter_cursor (0)
, pre_press_cursor (0)
, _note_player (0)
{
Gdk::Color c;
int r,g,b,a;
@ -317,6 +322,8 @@ MidiRegionView::connect_to_diskstream ()
bool
MidiRegionView::canvas_event(GdkEvent* ev)
{
bool r;
switch (ev->type) {
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY:
@ -356,7 +363,10 @@ MidiRegionView::canvas_event(GdkEvent* ev)
return button_press (&ev->button);
case GDK_BUTTON_RELEASE:
return button_release (&ev->button);
r = button_release (&ev->button);
delete _note_player;
_note_player = 0;
return r;
case GDK_ENTER_NOTIFY:
return enter_notify (&ev->crossing);
@ -665,12 +675,13 @@ MidiRegionView::scroll (GdkEventScroll* ev)
trackview.editor().verbose_cursor()->hide ();
bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);
bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
if (ev->direction == GDK_SCROLL_UP) {
change_velocities (true, fine, false);
change_velocities (true, fine, false, together);
} else if (ev->direction == GDK_SCROLL_DOWN) {
change_velocities (false, fine, false);
change_velocities (false, fine, false, together);
}
return true;
}
@ -735,9 +746,10 @@ MidiRegionView::key_press (GdkEventKey* ev)
bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::Level4Modifier);
if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
change_velocities (true, fine, allow_smush);
change_velocities (true, fine, allow_smush, together);
} else {
transpose (true, fine, allow_smush);
}
@ -747,9 +759,10 @@ MidiRegionView::key_press (GdkEventKey* ev)
bool allow_smush = Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier);
bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);
bool together = Keyboard::modifier_state_contains (ev->state, Keyboard::Level4Modifier);
if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
change_velocities (false, fine, allow_smush);
change_velocities (false, fine, allow_smush, together);
} else {
transpose (false, fine, allow_smush);
}
@ -768,6 +781,10 @@ MidiRegionView::key_press (GdkEventKey* ev)
} else if (ev->keyval == GDK_c && unmodified) {
channel_edit ();
return true;
} else if (ev->keyval == GDK_v && unmodified) {
velocity_edit ();
return true;
}
return false;
@ -786,20 +803,15 @@ MidiRegionView::key_release (GdkEventKey* ev)
void
MidiRegionView::channel_edit ()
{
bool first = true;
uint8_t current_channel = 0;
if (_selection.empty()) {
return;
}
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) {
if (first) {
current_channel = (*i)->note()->channel ();
first = false;
}
}
/* pick a note somewhat at random (since Selection is a set<>) to
* provide the "current" channel for the dialog.
*/
uint8_t current_channel = (*_selection.begin())->note()->channel ();
MidiChannelDialog channel_dialog (current_channel);
int ret = channel_dialog.run ();
@ -824,6 +836,42 @@ MidiRegionView::channel_edit ()
apply_diff ();
}
void
MidiRegionView::velocity_edit ()
{
if (_selection.empty()) {
return;
}
/* pick a note somewhat at random (since Selection is a set<>) to
* provide the "current" velocity for the dialog.
*/
uint8_t current_velocity = (*_selection.begin())->note()->velocity ();
MidiVelocityDialog velocity_dialog (current_velocity);
int ret = velocity_dialog.run ();
switch (ret) {
case Gtk::RESPONSE_OK:
break;
default:
return;
}
uint8_t new_velocity = velocity_dialog.velocity ();
start_note_diff_command (_("velocity edit"));
for (Selection::iterator i = _selection.begin(); i != _selection.end(); ) {
Selection::iterator next = i;
++next;
change_note_velocity (*i, new_velocity, false);
i = next;
}
apply_diff ();
}
void
MidiRegionView::show_list_editor ()
{
@ -1145,15 +1193,15 @@ MidiRegionView::display_patch_changes ()
uint16_t chn_mask = mtv->channel_selector().get_selected_channels();
for (uint8_t i = 0; i < 16; ++i) {
if (chn_mask & (1<<i)) {
display_patch_changes_on_channel (i);
}
/* TODO gray-out patch instad of not displaying it */
display_patch_changes_on_channel (i, chn_mask & (1 << i));
}
}
/** @param active_channel true to display patch changes fully, false to display
* them `greyed-out' (as on an inactive channel)
*/
void
MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
MidiRegionView::display_patch_changes_on_channel (uint8_t channel, bool active_channel)
{
for (MidiModel::PatchChanges::const_iterator i = _model->patch_changes().begin(); i != _model->patch_changes().end(); ++i) {
@ -1168,12 +1216,12 @@ MidiRegionView::display_patch_changes_on_channel (uint8_t channel)
_model_name, _custom_device_mode, channel, patch_key);
if (patch != 0) {
add_canvas_patch_change (*i, patch->name());
add_canvas_patch_change (*i, patch->name(), active_channel);
} else {
char buf[16];
/* program and bank numbers are zero-based: convert to one-based: MIDI_BP_ZERO */
snprintf (buf, 16, "%d %d", (*i)->program() + MIDI_BP_ZERO , (*i)->bank() + MIDI_BP_ZERO);
add_canvas_patch_change (*i, buf);
add_canvas_patch_change (*i, buf, active_channel);
}
}
}
@ -1278,6 +1326,8 @@ MidiRegionView::~MidiRegionView ()
end_write();
}
_selection_cleared_connection.disconnect ();
_selection.clear();
clear_events();
@ -1501,10 +1551,12 @@ MidiRegionView::play_midi_note(boost::shared_ptr<NoteType> note)
NotePlayer* np = new NotePlayer (route_ui->midi_track ());
np->add (note);
np->play ();
/* NotePlayer deletes itself */
}
void
MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
MidiRegionView::start_playing_midi_note(boost::shared_ptr<NoteType> note)
{
if (_no_sound_notes || !Config->get_sound_midi_notes()) {
return;
@ -1516,13 +1568,33 @@ MidiRegionView::play_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
return;
}
NotePlayer* np = new NotePlayer (route_ui->midi_track());
for (vector<boost::shared_ptr<NoteType> >::iterator n = notes.begin(); n != notes.end(); ++n) {
np->add (*n);
delete _note_player;
_note_player = new NotePlayer (route_ui->midi_track ());
_note_player->add (note);
_note_player->on ();
}
np->play ();
void
MidiRegionView::start_playing_midi_chord (vector<boost::shared_ptr<NoteType> > notes)
{
if (_no_sound_notes || !Config->get_sound_midi_notes()) {
return;
}
RouteUI* route_ui = dynamic_cast<RouteUI*> (&trackview);
if (!route_ui || !route_ui->midi_track()) {
return;
}
delete _note_player;
_note_player = new NotePlayer (route_ui->midi_track());
for (vector<boost::shared_ptr<NoteType> >::iterator n = notes.begin(); n != notes.end(); ++n) {
_note_player->add (*n);
}
_note_player->on ();
}
@ -1715,8 +1787,13 @@ MidiRegionView::step_sustain (Evoral::MusicalTime beats)
change_note_lengths (false, false, beats, false, true);
}
/** Add a new patch change flag to the canvas.
* @param patch the patch change to add
* @param the text to display in the flag
* @param active_channel true to display the flag as on an active channel, false to grey it out for an inactive channel.
*/
void
MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext)
MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const string& displaytext, bool active_channel)
{
assert (patch->time() >= 0);
@ -1732,7 +1809,8 @@ MidiRegionView::add_canvas_patch_change (MidiModel::PatchChangePtr patch, const
x, 1.0,
_model_name,
_custom_device_mode,
patch)
patch,
active_channel)
);
// Show unless patch change is beyond the region bounds
@ -2291,7 +2369,7 @@ MidiRegionView::add_to_selection (CanvasNoteEvent* ev)
if (_selection.insert (ev).second) {
ev->set_selected (true);
play_midi_note ((ev)->note());
start_playing_midi_note ((ev)->note());
}
if (add_mrv_selection) {
@ -2332,13 +2410,13 @@ MidiRegionView::move_selection(double dx, double dy, double cumulative_dy)
shifted.push_back (moved_note);
}
play_midi_chord (shifted);
start_playing_midi_chord (shifted);
} else if (!to_play.empty()) {
boost::shared_ptr<NoteType> moved_note (new NoteType (*to_play.front()));
moved_note->set_note (moved_note->note() + cumulative_dy);
play_midi_note (moved_note);
start_playing_midi_note (moved_note);
}
}
}
@ -2824,9 +2902,10 @@ MidiRegionView::change_note_length (CanvasNoteEvent* event, Evoral::MusicalTime
}
void
MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush)
MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush, bool all_together)
{
int8_t delta;
int8_t value;
if (_selection.empty()) {
return;
@ -2855,7 +2934,19 @@ MidiRegionView::change_velocities (bool up, bool fine, bool allow_smush)
for (Selection::iterator i = _selection.begin(); i != _selection.end();) {
Selection::iterator next = i;
++next;
if (all_together) {
if (i == _selection.begin()) {
change_note_velocity (*i, delta, true);
value = (*i)->note()->velocity() + delta;
} else {
change_note_velocity (*i, value, false);
}
} else {
change_note_velocity (*i, delta, true);
}
i = next;
}
@ -3734,3 +3825,10 @@ MidiRegionView::selection_cleared (MidiRegionView* rv)
/* Clear our selection in sympathy; but don't signal the fact */
clear_selection (false);
}
void
MidiRegionView::note_button_release ()
{
delete _note_player;
_note_player = 0;
}

24
gtk2_ardour/midi_region_view.h
View file

@ -64,6 +64,7 @@ class AutomationRegionView;
class MidiCutBuffer;
class MidiListEditor;
class EditNoteDialog;
class NotePlayer;
class MidiRegionView : public RegionView
{
@ -118,11 +119,7 @@ public:
void cut_copy_clear (Editing::CutCopyOp);
void paste (framepos_t pos, float times, const MidiCutBuffer&);
/** Add a new patch change flag to the canvas.
* @param patch the patch change to add
* @param the text to display in the flag
*/
void add_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr patch, const std::string& displaytext);
void add_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr patch, const std::string& displaytext, bool);
/** Look up the given time and channel in the 'automation' and set keys accordingly.
* @param time the time of the patch change event
@ -236,6 +233,8 @@ public:
MouseState mouse_state() const { return _mouse_state; }
void note_button_release ();
struct NoteResizeData {
ArdourCanvas::CanvasNote *canvas_note;
ArdourCanvas::SimpleRect *resize_rect;
@ -274,10 +273,11 @@ public:
void goto_previous_note (bool add_to_selection);
void goto_next_note (bool add_to_selection);
void change_note_lengths (bool, bool, Evoral::MusicalTime beats, bool start, bool end);
void change_velocities (bool up, bool fine, bool allow_smush);
void change_velocities (bool up, bool fine, bool allow_smush, bool all_together);
void transpose (bool up, bool fine, bool allow_smush);
void nudge_notes (bool forward);
void channel_edit ();
void velocity_edit ();
void show_list_editor ();
@ -342,12 +342,8 @@ private:
* and schedule the playback of the corresponding NoteOff event.
*/
void play_midi_note (boost::shared_ptr<NoteType> note);
void play_midi_chord (std::vector<boost::shared_ptr<NoteType> > notes);
/** Play the NoteOff-Event of the given note immediately
* (scheduled by @ref play_midi_note()).
*/
bool play_midi_note_off(boost::shared_ptr<NoteType> note);
void start_playing_midi_note (boost::shared_ptr<NoteType> note);
void start_playing_midi_chord (std::vector<boost::shared_ptr<NoteType> > notes);
void clear_events();
@ -465,7 +461,7 @@ private:
void maybe_select_by_position (GdkEventButton* ev, double x, double y);
void get_events (Events& e, Evoral::Sequence<Evoral::MusicalTime>::NoteOperator op, uint8_t val, int chan_mask = 0);
void display_patch_changes_on_channel (uint8_t);
void display_patch_changes_on_channel (uint8_t, bool);
void connect_to_diskstream ();
void data_recorded (boost::weak_ptr<ARDOUR::MidiSource>);
@ -481,6 +477,8 @@ private:
Gdk::Cursor* pre_enter_cursor;
Gdk::Cursor* pre_press_cursor;
NotePlayer* _note_player;
};

52
gtk2_ardour/midi_velocity_dialog.cc Normal file
View file

@ -0,0 +1,52 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm/stock.h>
#include "midi_velocity_dialog.h"
#include "i18n.h"
using namespace Gtk;
MidiVelocityDialog::MidiVelocityDialog (uint8_t current_velocity)
: ArdourDialog (X_("Note Velocity"), true)
, adjustment (current_velocity, 0, 127, 1, 16)
, spinner (adjustment)
, label (_("New velocity"))
{
spinner.show ();
label.show ();
packer.show ();
packer.pack_start (label, false, false);
packer.pack_start (spinner, false, false);
get_vbox()->pack_start (packer);
add_button (Stock::CANCEL, RESPONSE_CANCEL);
add_button (Stock::OK, RESPONSE_OK);
spinner.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &MidiVelocityDialog::response), Gtk::RESPONSE_OK));
}
uint8_t
MidiVelocityDialog::velocity () const
{
return (uint8_t) adjustment.get_value();
}

43
gtk2_ardour/midi_velocity_dialog.h Normal file
View file

@ -0,0 +1,43 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __gtk2_ardour_midi_velocity_dialog_h__
#define __gtk2_ardour_midi_velocity_dialog_h__
#include <stdint.h>
#include <gtkmm/adjustment.h>
#include <gtkmm/spinbutton.h>
#include "ardour_dialog.h"
class MidiVelocityDialog : public ArdourDialog
{
public:
MidiVelocityDialog (uint8_t current_velocity = 0);
uint8_t velocity() const;
private:
Gtk::Adjustment adjustment;
Gtk::SpinButton spinner;
Gtk::Label label;
Gtk::HBox packer;
};
#endif /* __gtk2_ardour_midi_velocity_dialog_h__ */

96
gtk2_ardour/mixer_ui.cc
View file

@ -233,8 +233,6 @@ Mixer_UI::Mixer_UI ()
list_hpane.show();
group_display.show();
auto_rebinding = FALSE;
_in_group_rebuild_or_clear = false;
MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
@ -595,6 +593,12 @@ Mixer_UI::set_session (Session* sess)
if (_visible) {
show_window();
/* Bit of a hack; if we're here, we're opening the mixer because of our
instant XML state having a show-mixer property. Fix up the corresponding
action state.
*/
ActionManager::check_toggleaction ("<Actions>/Common/toggle-mixer");
}
start_updating ();
@ -888,12 +892,6 @@ Mixer_UI::redisplay_track_list ()
_session->sync_order_keys (N_("signal"));
}
// Resigc::bind all of the midi controls automatically
if (auto_rebinding) {
auto_rebind_midi_controls ();
}
_group_tabs->set_dirty ();
}
@ -924,88 +922,6 @@ Mixer_UI::strip_width_changed ()
}
void
Mixer_UI::set_auto_rebinding( bool val )
{
if( val == TRUE )
{
auto_rebinding = TRUE;
Session::AutoBindingOff();
}
else
{
auto_rebinding = FALSE;
Session::AutoBindingOn();
}
}
void
Mixer_UI::toggle_auto_rebinding()
{
if (auto_rebinding)
{
set_auto_rebinding( FALSE );
}
else
{
set_auto_rebinding( TRUE );
}
auto_rebind_midi_controls();
}
void
Mixer_UI::auto_rebind_midi_controls ()
{
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
int pos;
// Create bindings for all visible strips and remove those that are not visible
pos = 1; // 0 is reserved for the master strip
for (i = rows.begin(); i != rows.end(); ++i) {
MixerStrip* strip = (*i)[track_columns.strip];
if ( (*i)[track_columns.visible] == true ) { // add bindings for
// make the actual binding
//cout<<"Auto Binding: Visible Strip Found: "<<strip->name()<<endl;
int controlValue = pos;
if( strip->route()->is_master() ) {
controlValue = 0;
}
else {
pos++;
}
PBD::Controllable::CreateBinding ( strip->solo_button->get_controllable().get(), controlValue, 0);
PBD::Controllable::CreateBinding ( strip->mute_button->get_controllable().get(), controlValue, 1);
if( strip->is_audio_track() ) {
PBD::Controllable::CreateBinding ( strip->rec_enable_button->get_controllable().get(), controlValue, 2);
}
PBD::Controllable::CreateBinding ( strip->gpm.get_controllable().get(), controlValue, 3);
PBD::Controllable::CreateBinding ( strip->panners.get_controllable().get(), controlValue, 4);
}
else { // Remove any existing binding
PBD::Controllable::DeleteBinding ( strip->solo_button->get_controllable().get() );
PBD::Controllable::DeleteBinding ( strip->mute_button->get_controllable().get() );
if( strip->is_audio_track() ) {
PBD::Controllable::DeleteBinding ( strip->rec_enable_button->get_controllable().get() );
}
PBD::Controllable::DeleteBinding ( strip->gpm.get_controllable().get() );
PBD::Controllable::DeleteBinding ( strip->panners.get_controllable().get() ); // This only takes the first panner if there are multiples...
}
} // for
}
struct SignalOrderRouteSorter {
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
/* use of ">" forces the correct sort order */

5
gtk2_ardour/mixer_ui.h
View file

@ -78,8 +78,6 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
void hide_strip (MixerStrip *);
void ensure_float (Gtk::Window&);
void toggle_auto_rebinding ();
void set_auto_rebinding(bool);
MonitorSection* monitor_section() const { return _monitor_section; }
@ -144,9 +142,6 @@ class Mixer_UI : public Gtk::Window, public PBD::ScopedConnectionList, public AR
void unselect_all_audiobus_strips ();
void select_all_audiobus_strips ();
void auto_rebind_midi_controls ();
bool auto_rebinding;
void strip_select_op (bool audiotrack, bool select);
void select_strip_op (MixerStrip*, bool select);

14
gtk2_ardour/mono_panner.cc
View file

@ -38,6 +38,7 @@
#include "ardour_ui.h"
#include "global_signals.h"
#include "mono_panner.h"
#include "mono_panner_editor.h"
#include "rgb_macros.h"
#include "utils.h"
@ -246,6 +247,10 @@ MonoPanner::on_expose_event (GdkEventExpose*)
bool
MonoPanner::on_button_press_event (GdkEventButton* ev)
{
if (PannerInterface::on_button_press_event (ev)) {
return true;
}
drag_start_x = ev->x;
last_drag_x = ev->x;
@ -304,6 +309,10 @@ MonoPanner::on_button_press_event (GdkEventButton* ev)
bool
MonoPanner::on_button_release_event (GdkEventButton* ev)
{
if (PannerInterface::on_button_release_event (ev)) {
return true;
}
if (ev->button != 1) {
return false;
}
@ -440,3 +449,8 @@ MonoPanner::color_handler ()
queue_draw ();
}
PannerEditor*
MonoPanner::editor ()
{
return new MonoPannerEditor (this);
}

2
gtk2_ardour/mono_panner.h
View file

@ -52,6 +52,8 @@ class MonoPanner : public PannerInterface
bool on_key_press_event (GdkEventKey*);
private:
PannerEditor* editor ();
boost::shared_ptr<PBD::Controllable> position_control;
PBD::ScopedConnectionList connections;
int drag_start_x;

119
gtk2_ardour/mono_panner_editor.cc Normal file
View file

@ -0,0 +1,119 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm.h>
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/gui_thread.h"
#include "pbd/controllable.h"
#include "mono_panner_editor.h"
#include "mono_panner.h"
#include "i18n.h"
using namespace Gtk;
using namespace Gtkmm2ext;
MonoPannerEditor::MonoPannerEditor (MonoPanner* p)
: PannerEditor (_("Mono Panner"))
, _panner (p)
, _ignore_changes (false)
{
Table* t = manage (new Table (2, 3));
t->set_spacings (6);
int n = 0;
t->attach (*manage (left_aligned_label (_("Left"))), 0, 1, n, n + 1);
t->attach (_left, 1, 2, n, n + 1);
t->attach (*manage (left_aligned_label (_("%"))), 2, 3, n, n + 1);
++n;
t->attach (*manage (left_aligned_label (_("Right"))), 0, 1, n, n + 1);
t->attach (_right, 1, 2, n, n + 1);
t->attach (*manage (left_aligned_label (_("%"))), 2, 3, n, n + 1);
++n;
get_vbox()->pack_start (*manage (t));
get_vbox()->set_spacing (6);
_left.set_increments (1, 10);
_left.set_range (0, 100);
_right.set_increments (1, 10);
_right.set_range (0, 100);
_panner->get_controllable()->Changed.connect (_connections, invalidator (*this), boost::bind (&MonoPannerEditor::update_editor, this), gui_context ());
_panner->DropReferences.connect (_connections, invalidator (*this), boost::bind (&MonoPannerEditor::panner_going_away, this), gui_context ());
_left.signal_value_changed().connect (sigc::mem_fun (*this, &MonoPannerEditor::left_changed));
_right.signal_value_changed().connect (sigc::mem_fun (*this, &MonoPannerEditor::right_changed));
show_all ();
update_editor ();
}
void
MonoPannerEditor::panner_going_away ()
{
_panner = 0;
}
void
MonoPannerEditor::update_editor ()
{
if (!_panner) {
return;
}
float const v = _panner->get_controllable()->get_value();
_ignore_changes = true;
_left.set_value (100 * (1 - v));
_right.set_value (100 * v);
_ignore_changes = false;
}
void
MonoPannerEditor::left_changed ()
{
if (_ignore_changes || !_panner) {
return;
}
float const v = 1 - _left.get_value () / 100;
_ignore_changes = true;
_right.set_value (100 * v);
_panner->get_controllable()->set_value (v);
_ignore_changes = false;
}
void
MonoPannerEditor::right_changed ()
{
if (_ignore_changes || !_panner) {
return;
}
float const v = _right.get_value () / 100;
_ignore_changes = true;
_left.set_value (100 * (1 - v));
_panner->get_controllable()->set_value (v);
_ignore_changes = false;
}

43
gtk2_ardour/mono_panner_editor.h Normal file
View file

@ -0,0 +1,43 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm.h>
#include "panner_editor.h"
class MonoPanner;
/** Editor dialog for the mono panner */
class MonoPannerEditor : public PannerEditor
{
public:
MonoPannerEditor (MonoPanner *);
private:
void panner_going_away ();
void update_editor ();
void left_changed ();
void right_changed ();
MonoPanner* _panner;
Gtk::SpinButton _left;
Gtk::SpinButton _right;
bool _ignore_changes;
PBD::ScopedConnectionList _connections;
};

13
gtk2_ardour/note_player.cc
View file

@ -31,6 +31,11 @@ NotePlayer::NotePlayer (boost::shared_ptr<MidiTrack> mt)
{
}
NotePlayer::~NotePlayer ()
{
clear ();
}
void
NotePlayer::add (boost::shared_ptr<NoteType> note)
{
@ -45,11 +50,17 @@ NotePlayer::clear ()
}
void
NotePlayer::play ()
NotePlayer::on ()
{
for (Notes::iterator n = notes.begin(); n != notes.end(); ++n) {
track->write_immediate_event ((*n)->on_event().size(), (*n)->on_event().buffer());
}
}
void
NotePlayer::play ()
{
on ();
/* note: if there is more than 1 note, we will silence them all at the same time
*/

3
gtk2_ardour/note_player.h
View file

@ -34,10 +34,11 @@ public:
typedef Evoral::Note<Evoral::MusicalTime> NoteType;
NotePlayer (boost::shared_ptr<ARDOUR::MidiTrack>);
~NotePlayer () {}
~NotePlayer ();
void add (boost::shared_ptr<NoteType>);
void play ();
void on ();
void off ();
void clear ();

6
gtk2_ardour/option_editor.cc
View file

@ -87,8 +87,7 @@ OptionEditorHeading::OptionEditorHeading (string const & h)
{
std::stringstream s;
s << "<b>" << h << "</b>";
_label = manage (new Label (s.str()));
_label->set_alignment (0, 0.5);
_label = manage (left_aligned_label (s.str()));
_label->set_use_markup (true);
}
@ -141,8 +140,7 @@ EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string>
_get (g),
_set (s)
{
_label = manage (new Label (n + ":"));
_label->set_alignment (0, 0.5);
_label = manage (left_aligned_label (n + ":"));
_entry = manage (new Entry);
_entry->signal_activate().connect (sigc::mem_fun (*this, &EntryOption::activated));
}

37
gtk2_ardour/panner_editor.cc Normal file
View file

@ -0,0 +1,37 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "panner_editor.h"
#include "i18n.h"
using namespace std;
using namespace Gtk;
PannerEditor::PannerEditor (string t)
: ArdourDialog (t)
{
Button* b = add_button (_("Close"), RESPONSE_CANCEL);
b->signal_clicked().connect (sigc::mem_fun(*this, &PannerEditor::close_button_clicked));
}
void
PannerEditor::close_button_clicked ()
{
hide ();
}

29
gtk2_ardour/panner_editor.h Normal file
View file

@ -0,0 +1,29 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "ardour_dialog.h"
class PannerEditor : public ArdourDialog
{
public:
PannerEditor (std::string);
private:
void close_button_clicked ();
};

32
gtk2_ardour/panner_interface.cc
View file

@ -20,6 +20,7 @@
#include <gtkmm.h>
#include "gtkmm2ext/keyboard.h"
#include "panner_interface.h"
#include "panner_editor.h"
#include "global_signals.h"
#include "i18n.h"
@ -34,6 +35,7 @@ PannerInterface::PannerInterface (boost::shared_ptr<Panner> p)
, _drag_data_window (0)
, _drag_data_label (0)
, _dragging (false)
, _editor (0)
{
set_flags (Gtk::CAN_FOCUS);
@ -48,6 +50,7 @@ PannerInterface::PannerInterface (boost::shared_ptr<Panner> p)
PannerInterface::~PannerInterface ()
{
delete _drag_data_window;
delete _editor;
}
void
@ -135,3 +138,32 @@ PannerInterface::value_change ()
queue_draw ();
}
bool
PannerInterface::on_button_press_event (GdkEventButton* ev)
{
if (Gtkmm2ext::Keyboard::is_edit_event (ev)) {
edit ();
return true;
}
return false;
}
bool
PannerInterface::on_button_release_event (GdkEventButton* ev)
{
if (Gtkmm2ext::Keyboard::is_edit_event (ev)) {
/* We edited on the press, so claim the release */
return true;
}
return false;
}
void
PannerInterface::edit ()
{
delete _editor;
_editor = editor ();
_editor->show ();
}

16
gtk2_ardour/panner_interface.h
View file

@ -23,18 +23,27 @@
#include <boost/shared_ptr.hpp>
#include <gtkmm/drawingarea.h>
#include <gtkmm/label.h>
#include "pbd/destructible.h"
namespace ARDOUR {
class Panner;
}
class PannerEditor;
/** Parent class for some panner UI classes that contains some common code */
class PannerInterface : public Gtk::DrawingArea
class PannerInterface : public Gtk::DrawingArea, public PBD::Destructible
{
public:
PannerInterface (boost::shared_ptr<ARDOUR::Panner>);
virtual ~PannerInterface ();
boost::shared_ptr<ARDOUR::Panner> panner () {
return _panner;
}
void edit ();
protected:
virtual void set_drag_data () = 0;
@ -45,6 +54,8 @@ protected:
bool on_enter_notify_event (GdkEventCrossing *);
bool on_leave_notify_event (GdkEventCrossing *);
bool on_key_release_event (GdkEventKey *);
bool on_button_press_event (GdkEventButton*);
bool on_button_release_event (GdkEventButton*);
boost::shared_ptr<ARDOUR::Panner> _panner;
Gtk::Window* _drag_data_window;
@ -54,6 +65,9 @@ protected:
private:
bool drag_data_timeout ();
sigc::connection _drag_data_timeout;
virtual PannerEditor* editor () = 0;
PannerEditor* _editor;
};
#endif

27
gtk2_ardour/panner_ui.cc
View file

@ -37,7 +37,6 @@
#include "stereo_panner.h"
#include "mono_panner.h"
#include "i18n.h"
using namespace std;
@ -176,13 +175,6 @@ PannerUI::build_astyle_menu ()
pan_astyle_menu->items().push_back (MenuElem (_("Abs")));
}
boost::shared_ptr<PBD::Controllable>
PannerUI::get_controllable()
{
assert (!pan_bars.empty());
return pan_bars[0]->get_controllable();
}
void
PannerUI::on_size_allocate (Allocation& a)
{
@ -197,10 +189,6 @@ PannerUI::set_width (Width w)
PannerUI::~PannerUI ()
{
for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
delete (*i);
}
delete twod_panner;
delete big_window;
delete pan_menu;
@ -399,6 +387,7 @@ PannerUI::build_pan_menu ()
bypass_menu_item->signal_toggled().connect (sigc::mem_fun(*this, &PannerUI::pan_bypass_toggle));
items.push_back (MenuElem (_("Reset"), sigc::mem_fun (*this, &PannerUI::pan_reset)));
items.push_back (MenuElem (_("Edit..."), sigc::mem_fun (*this, &PannerUI::pan_edit)));
}
void
@ -409,6 +398,16 @@ PannerUI::pan_bypass_toggle ()
}
}
void
PannerUI::pan_edit ()
{
if (_mono_panner) {
_mono_panner->edit ();
} else if (_stereo_panner) {
_stereo_panner->edit ();
}
}
void
PannerUI::pan_reset ()
{
@ -422,10 +421,6 @@ PannerUI::effective_pan_display ()
_stereo_panner->queue_draw ();
} else if (twod_panner) {
twod_panner->queue_draw ();
} else {
for (vector<MonoPanner*>::iterator i = pan_bars.begin(); i != pan_bars.end(); ++i) {
(*i)->queue_draw ();
}
}
}

4
gtk2_ardour/panner_ui.h
View file

@ -77,7 +77,6 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void effective_pan_display ();
void set_meter_strip_name (std::string name);
boost::shared_ptr<PBD::Controllable> get_controllable();
void on_size_allocate (Gtk::Allocation &);
@ -122,8 +121,6 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
Gtk::Button pan_automation_style_button;
Gtk::ToggleButton pan_automation_state_button;
std::vector<MonoPanner*> pan_bars;
void pan_value_changed (uint32_t which);
void build_astate_menu ();
void build_astyle_menu ();
@ -143,6 +140,7 @@ class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void build_pan_menu ();
void pan_reset ();
void pan_bypass_toggle ();
void pan_edit ();
void pan_automation_state_changed();
void pan_automation_style_changed();

20
gtk2_ardour/patch_change_dialog.cc
View file

@ -21,6 +21,7 @@
#include <gtkmm/stock.h>
#include <gtkmm/table.h>
#include <boost/algorithm/string.hpp>
#include "gtkmm2ext/utils.h"
#include "ardour/midi_patch_manager.h"
#include "ardour/beats_frames_converter.h"
#include "patch_change_dialog.h"
@ -28,6 +29,7 @@
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
/** @param tc If non-0, a time converter for this patch change. If 0, time control will be desensitized */
PatchChangeDialog::PatchChangeDialog (
@ -55,8 +57,7 @@ PatchChangeDialog::PatchChangeDialog (
if (_time_converter) {
l = manage (new Label (_("Time")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Time")));
t->attach (*l, 0, 1, r, r + 1);
t->attach (_time, 1, 2, r, r + 1);
++r;
@ -66,24 +67,21 @@ PatchChangeDialog::PatchChangeDialog (
_time.set (_time_converter->to (patch.time ()), true);
}
l = manage (new Label (_("Patch Bank")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Patch Bank")));
t->attach (*l, 0, 1, r, r + 1);
t->attach (_bank_combo, 1, 2, r, r + 1);
++r;
_bank_combo.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::bank_combo_changed));
l = manage (new Label (_("Patch")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Patch")));
t->attach (*l, 0, 1, r, r + 1);
t->attach (_patch_combo, 1, 2, r, r + 1);
++r;
_patch_combo.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::patch_combo_changed));
l = manage (new Label (_("Channel")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Channel")));
t->attach (*l, 0, 1, r, r + 1);
t->attach (_channel, 1, 2, r, r + 1);
++r;
@ -91,8 +89,7 @@ PatchChangeDialog::PatchChangeDialog (
_channel.set_value (patch.channel() + 1);
_channel.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::channel_changed));
l = manage (new Label (_("Program")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Program")));
t->attach (*l, 0, 1, r, r + 1);
t->attach (_program, 1, 2, r, r + 1);
++r;
@ -100,8 +97,7 @@ PatchChangeDialog::PatchChangeDialog (
_program.set_value (patch.program () + 1);
_program.signal_changed().connect (sigc::mem_fun (*this, &PatchChangeDialog::program_changed));
l = manage (new Label (_("Bank")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Bank")));
t->attach (*l, 0, 1, r, r + 1);
t->attach (_bank, 1, 2, r, r + 1);
++r;

10
gtk2_ardour/plugin_ui.cc
View file

@ -89,6 +89,11 @@ PluginUIWindow::PluginUIWindow (
: parent (win)
, was_visible (false)
, _keyboard_focused (false)
#ifdef AUDIOUNIT_SUPPORT
, pre_deactivate_x (-1)
, pre_deactivate_y (-1)
#endif
{
bool have_gui = false;
@ -341,11 +346,15 @@ PluginUIWindow::app_activated (bool)
if (yn) {
if (was_visible) {
_pluginui->activate ();
if (pre_deactivate_x >= 0) {
move (pre_deactivate_x, pre_deactivate_y);
}
present ();
was_visible = true;
}
} else {
was_visible = is_visible();
get_position (pre_deactivate_x, pre_deactivate_y);
hide ();
_pluginui->deactivate ();
}
@ -783,3 +792,4 @@ PlugUIBase::preset_added_or_removed ()
update_preset_list ();
update_preset ();
}

5
gtk2_ardour/plugin_ui.h
View file

@ -312,6 +312,11 @@ class PluginUIWindow : public Gtk::Window
Gtk::VBox vbox;
bool was_visible;
bool _keyboard_focused;
#ifdef AUDIOUNIT_SUPPORT
int pre_deactivate_x;
int pre_deactivate_y;
#endif
void keyboard_focused (bool yn);
void app_activated (bool);

7835
gtk2_ardour/po/es.po
View file

File diff suppressed because it is too large Load diff

6
gtk2_ardour/processor_box.cc
View file

@ -44,6 +44,7 @@
#include "ardour/audioengine.h"
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
#include "ardour/midi_track.h"
#include "ardour/plugin_insert.h"
#include "ardour/port_insert.h"
#include "ardour/profile.h"
@ -858,7 +859,10 @@ ProcessorBox::build_possible_aux_menu ()
{
boost::shared_ptr<RouteList> rl = _session->get_routes_with_internal_returns();
if (rl->empty()) {
if (rl->empty() || boost::dynamic_pointer_cast<MidiTrack> (_route)) {
/* No aux sends if there are no busses, or if this route is a MIDI track
(one day, but not now ...)
*/
return 0;
}

29
gtk2_ardour/rc_option_editor.cc
View file

@ -65,16 +65,14 @@ public:
Table* t = manage (new Table (2, 3));
t->set_spacings (4);
Label* l = manage (new Label (_("Click audio file:")));
l->set_alignment (0, 0.5);
Label* l = manage (left_aligned_label (_("Click audio file:")));
t->attach (*l, 0, 1, 0, 1, FILL);
t->attach (_click_path_entry, 1, 2, 0, 1, FILL);
Button* b = manage (new Button (_("Browse...")));
b->signal_clicked().connect (sigc::mem_fun (*this, &ClickOptions::click_browse_clicked));
t->attach (*b, 2, 3, 0, 1, FILL);
l = manage (new Label (_("Click emphasis audio file:")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("Click emphasis audio file:")));
t->attach (*l, 0, 1, 1, 2, FILL);
t->attach (_click_emphasis_path_entry, 1, 2, 1, 2, FILL);
b = manage (new Button (_("Browse...")));
@ -171,16 +169,14 @@ public:
_limit_undo_spin.set_range (0, 512);
_limit_undo_spin.set_increments (1, 10);
t->attach (_limit_undo_spin, 1, 2, 0, 1, FILL | EXPAND);
Label* l = manage (new Label (_("commands")));
l->set_alignment (0, 0.5);
Label* l = manage (left_aligned_label (_("commands")));
t->attach (*l, 2, 3, 0, 1);
t->attach (_save_undo_button, 0, 1, 1, 2, FILL);
_save_undo_spin.set_range (0, 512);
_save_undo_spin.set_increments (1, 10);
t->attach (_save_undo_spin, 1, 2, 1, 2, FILL | EXPAND);
l = manage (new Label (_("commands")));
l->set_alignment (0, 0.5);
l = manage (left_aligned_label (_("commands")));
t->attach (*l, 2, 3, 1, 2);
_box->pack_start (*t);
@ -318,9 +314,8 @@ public:
Table* t = manage (new Table (4, 4));
t->set_spacings (4);
Label* l = manage (new Label (_("Edit using:")));
Label* l = manage (left_aligned_label (_("Edit using:")));
l->set_name ("OptionsLabel");
l->set_alignment (0, 0.5);
t->attach (*l, 0, 1, 0, 1, FILL | EXPAND, FILL);
t->attach (_edit_modifier_combo, 1, 2, 0, 1, FILL | EXPAND, FILL);
@ -345,9 +340,8 @@ public:
}
}
l = manage (new Label (_("Delete using:")));
l = manage (left_aligned_label (_("Delete using:")));
l->set_name ("OptionsLabel");
l->set_alignment (0, 0.5);
t->attach (*l, 0, 1, 1, 2, FILL | EXPAND, FILL);
t->attach (_delete_modifier_combo, 1, 2, 1, 2, FILL | EXPAND, FILL);
@ -373,9 +367,8 @@ public:
}
}
l = manage (new Label (_("Insert note using:")));
l = manage (left_aligned_label (_("Insert note using:")));
l->set_name ("OptionsLabel");
l->set_alignment (0, 0.5);
t->attach (*l, 0, 1, 2, 3, FILL | EXPAND, FILL);
t->attach (_insert_note_modifier_combo, 1, 2, 2, 3, FILL | EXPAND, FILL);
@ -401,9 +394,8 @@ public:
}
}
l = manage (new Label (_("Toggle snap using:")));
l = manage (left_aligned_label (_("Toggle snap using:")));
l->set_name ("OptionsLabel");
l->set_alignment (0, 0.5);
t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL);
t->attach (_snap_modifier_combo, 1, 2, 3, 4, FILL | EXPAND, FILL);
@ -418,9 +410,8 @@ public:
_keyboard_layout_selector.set_active_text (Keyboard::current_binding_name());
_keyboard_layout_selector.signal_changed().connect (sigc::mem_fun (*this, &KeyboardOptions::bindings_changed));
l = manage (new Label (_("Keyboard layout:")));
l = manage (left_aligned_label (_("Keyboard layout:")));
l->set_name ("OptionsLabel");
l->set_alignment (0, 0.5);
t->attach (*l, 0, 1, 4, 5, FILL | EXPAND, FILL);
t->attach (_keyboard_layout_selector, 1, 2, 4, 5, FILL | EXPAND, FILL);
@ -947,7 +938,7 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Misc"),
new FaderOption (
"click-gain",
_("Click Gain Level"),
_("Click gain level"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_click_gain),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_click_gain)
));

33
gtk2_ardour/speaker_dialog.cc
View file

@ -34,7 +34,7 @@ using namespace Gtkmm2ext;
SpeakerDialog::SpeakerDialog ()
: ArdourWindow (_("Speaker Configuration"))
, aspect_frame ("", 0.5, 0.5, 1.0, false)
, aspect_frame ("", 0.5, 0.5, 1.5, false)
, azimuth_adjustment (0, 0.0, 360.0, 10.0, 1.0)
, azimuth_spinner (azimuth_adjustment)
, add_speaker_button (_("Add Speaker"))
@ -49,14 +49,14 @@ SpeakerDialog::SpeakerDialog ()
side_vbox.set_spacing (6);
side_vbox.pack_start (add_speaker_button, false, false);
aspect_frame.set_size_request (200, 200);
aspect_frame.set_size_request (300, 200);
aspect_frame.set_shadow_type (SHADOW_NONE);
aspect_frame.add (darea);
hbox.set_spacing (6);
hbox.set_border_width (6);
hbox.pack_start (aspect_frame, true, true);
hbox.pack_start (side_vbox, true, true);
hbox.pack_start (side_vbox, false, false);
HBox* current_speaker_hbox = manage (new HBox);
current_speaker_hbox->set_spacing (4);
@ -162,6 +162,12 @@ SpeakerDialog::darea_expose_event (GdkEventExpose* event)
cart_to_gtk (c);
/* We have already moved our plotting origin to x_origin, y_origin,
so compensate for that.
*/
c.x -= x_origin;
c.y -= y_origin;
x = (gint) floor (c.x);
y = (gint) floor (c.y);
@ -179,7 +185,11 @@ SpeakerDialog::darea_expose_event (GdkEventExpose* event)
cairo_move_to (cr, x + 6, y + 6);
char buf[256];
if (n == selected_index) {
snprintf (buf, sizeof (buf), "%d:%d", n+1, (int) lrint (s.angles().azi));
} else {
snprintf (buf, sizeof (buf), "%d", n + 1);
}
cairo_show_text (cr, buf);
++n;
}
@ -207,8 +217,8 @@ SpeakerDialog::cart_to_gtk (CartesianVector& c) const
0,height
*/
c.x = (width / 2) * (c.x + 1);
c.y = (height / 2) * (1 - c.y);
c.x = (width / 2) * (c.x + 1) + x_origin;
c.y = (height / 2) * (1 - c.y) + y_origin;
/* XXX z-axis not handled - 2D for now */
}
@ -216,8 +226,8 @@ SpeakerDialog::cart_to_gtk (CartesianVector& c) const
void
SpeakerDialog::gtk_to_cart (CartesianVector& c) const
{
c.x = (c.x / (width / 2.0)) - 1.0;
c.y = -((c.y / (height / 2.0)) - 1.0);
c.x = ((c.x - x_origin) / (width / 2.0)) - 1.0;
c.y = -(((c.y - y_origin) / (height / 2.0)) - 1.0);
/* XXX z-axis not handled - 2D for now */
}
@ -239,12 +249,19 @@ SpeakerDialog::darea_size_allocate (Gtk::Allocation& alloc)
width = alloc.get_width();
height = alloc.get_height();
/* The allocation will (should) be rectangualar, but make the basic
drawing square; space to the right of the square is for over-hanging
text labels.
*/
width = height;
if (height > 100) {
width -= 20;
height -= 20;
}
x_origin = (alloc.get_width() - width) / 2;
/* Put the x origin to the left of the rectangular allocation */
x_origin = (alloc.get_width() - width) / 3;
y_origin = (alloc.get_height() - height) / 2;
}

14
gtk2_ardour/startup.cc
View file

@ -126,7 +126,7 @@ Ardour will play NO role in monitoring"))
bool need_audio_setup = !EngineControl::engine_running();
setup_prerelease_page ();
// setup_prerelease_page ();
if (new_user) {
@ -549,10 +549,10 @@ ArdourStartup::setup_initial_choice_page ()
centering_vbox->pack_start (ic_new_session_button, false, true);
centering_vbox->pack_start (ic_existing_session_button, false, true);
ic_new_session_button.signal_clicked().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked));
ic_new_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked), false);
ic_new_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false);
ic_existing_session_button.signal_clicked().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked));
ic_existing_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked), false);
ic_existing_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false);
centering_hbox->pack_start (*centering_vbox, true, true);
@ -572,12 +572,14 @@ ArdourStartup::setup_initial_choice_page ()
set_page_complete (ic_vbox, true);
}
void
ArdourStartup::initial_button_clicked ()
bool
ArdourStartup::initial_button_clicked (GdkEventButton* ev)
{
if (session_page_index != -1) {
if (ev->type == GDK_2BUTTON_PRESS && session_page_index != -1) {
set_current_page(session_page_index);
}
return false;
}
void

2
gtk2_ardour/startup.h
View file

@ -117,7 +117,7 @@ class ArdourStartup : public Gtk::Assistant {
Gtk::VBox ic_vbox;
Gtk::RadioButton ic_new_session_button;
Gtk::RadioButton ic_existing_session_button;
void initial_button_clicked();
bool initial_button_clicked(GdkEventButton*);
void initial_button_activated();
/* monitoring choices */

15
gtk2_ardour/stereo_panner.cc
View file

@ -37,6 +37,7 @@
#include "ardour_ui.h"
#include "global_signals.h"
#include "stereo_panner.h"
#include "stereo_panner_editor.h"
#include "rgb_macros.h"
#include "utils.h"
@ -263,6 +264,10 @@ StereoPanner::on_expose_event (GdkEventExpose*)
bool
StereoPanner::on_button_press_event (GdkEventButton* ev)
{
if (PannerInterface::on_button_press_event (ev)) {
return true;
}
drag_start_x = ev->x;
last_drag_x = ev->x;
@ -398,6 +403,10 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
bool
StereoPanner::on_button_release_event (GdkEventButton* ev)
{
if (PannerInterface::on_button_release_event (ev)) {
return true;
}
if (ev->button != 1) {
return false;
}
@ -631,3 +640,9 @@ StereoPanner::color_handler ()
set_colors ();
queue_draw ();
}
PannerEditor*
StereoPanner::editor ()
{
return new StereoPannerEditor (this);
}

5
gtk2_ardour/stereo_panner.h
View file

@ -38,6 +38,9 @@ class StereoPanner : public PannerInterface
StereoPanner (boost::shared_ptr<ARDOUR::Panner>);
~StereoPanner ();
boost::shared_ptr<PBD::Controllable> get_position_controllable() const { return position_control; }
boost::shared_ptr<PBD::Controllable> get_width_controllable() const { return width_control; }
sigc::signal<void> StartPositionGesture;
sigc::signal<void> StopPositionGesture;
sigc::signal<void> StartWidthGesture;
@ -52,6 +55,8 @@ class StereoPanner : public PannerInterface
bool on_key_press_event (GdkEventKey*);
private:
PannerEditor* editor ();
boost::shared_ptr<PBD::Controllable> position_control;
boost::shared_ptr<PBD::Controllable> width_control;
PBD::ScopedConnectionList connections;

138
gtk2_ardour/stereo_panner_editor.cc Normal file
View file

@ -0,0 +1,138 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm.h>
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/gtk_ui.h"
#include "gtkmm2ext/gui_thread.h"
#include "ardour/panner.h"
#include "pbd/controllable.h"
#include "stereo_panner_editor.h"
#include "stereo_panner.h"
#include "i18n.h"
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
StereoPannerEditor::StereoPannerEditor (StereoPanner* p)
: PannerEditor (_("Stereo Panner"))
, _panner (p)
, _ignore_changes (false)
{
Table* t = manage (new Table (2, 3));
t->set_spacings (6);
int n = 0;
t->attach (*manage (left_aligned_label (_("Position"))), 0, 1, n, n + 1);
t->attach (_position, 1, 2, n, n + 1);
t->attach (*manage (left_aligned_label (_("%"))), 2, 3, n, n + 1);
++n;
t->attach (*manage (left_aligned_label (_("Width"))), 0, 1, n, n + 1);
t->attach (_width, 1, 2, n, n + 1);
t->attach (*manage (left_aligned_label (_("%"))), 2, 3, n, n + 1);
++n;
get_vbox()->pack_start (*manage (t));
get_vbox()->set_spacing (6);
_position.set_increments (1, 10);
_width.set_increments (1, 10);
set_position_range ();
set_width_range ();
_panner->get_position_controllable()->Changed.connect (
_connections, invalidator (*this), boost::bind (&StereoPannerEditor::update_editor, this), gui_context ()
);
_panner->get_width_controllable()->Changed.connect (
_connections, invalidator (*this), boost::bind (&StereoPannerEditor::update_editor, this), gui_context ()
);
_panner->DropReferences.connect (_connections, invalidator (*this), boost::bind (&StereoPannerEditor::panner_going_away, this), gui_context ());
_position.signal_value_changed().connect (sigc::mem_fun (*this, &StereoPannerEditor::position_changed));
_width.signal_value_changed().connect (sigc::mem_fun (*this, &StereoPannerEditor::width_changed));
show_all ();
update_editor ();
}
void
StereoPannerEditor::panner_going_away ()
{
_panner = 0;
}
void
StereoPannerEditor::update_editor ()
{
if (!_panner) {
return;
}
_ignore_changes = true;
_position.set_value (100 * _panner->get_position_controllable()->get_value ());
_width.set_value (100 * _panner->get_width_controllable()->get_value ());
_ignore_changes = false;
}
void
StereoPannerEditor::position_changed ()
{
if (_ignore_changes || !_panner) {
return;
}
_ignore_changes = true;
double const v = _position.get_value() / 100;
_panner->get_position_controllable()->set_value (v);
set_width_range ();
_ignore_changes = false;
}
void
StereoPannerEditor::width_changed ()
{
if (_ignore_changes || !_panner) {
return;
}
_ignore_changes = true;
double const v = _width.get_value() / 100;
_panner->get_width_controllable()->set_value (v);
set_position_range ();
_ignore_changes = false;
}
void
StereoPannerEditor::set_position_range ()
{
pair<double, double> const pr = _panner->panner()->position_range ();
_position.set_range (pr.first * 100, pr.second * 100);
}
void
StereoPannerEditor::set_width_range ()
{
pair<double, double> const wr = _panner->panner()->width_range ();
_width.set_range (wr.first * 100, wr.second * 100);
}

45
gtk2_ardour/stereo_panner_editor.h Normal file
View file

@ -0,0 +1,45 @@
/*
Copyright (C) 2012 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <gtkmm.h>
#include "panner_editor.h"
class StereoPanner;
/** Editor dialog for the stereo panner */
class StereoPannerEditor : public PannerEditor
{
public:
StereoPannerEditor (StereoPanner *);
private:
void panner_going_away ();
void update_editor ();
void position_changed ();
void width_changed ();
void set_position_range ();
void set_width_range ();
StereoPanner* _panner;
Gtk::SpinButton _position;
Gtk::SpinButton _width;
bool _ignore_changes;
PBD::ScopedConnectionList _connections;
};

2
gtk2_ardour/visibility_group.h
View file

@ -41,7 +41,7 @@ public:
Gtk::Widget *,
std::string const &,
std::string const &,
bool visible = 0,
bool visible = false,
boost::function<boost::optional<bool> ()> = 0
);

4
gtk2_ardour/wscript
View file

@ -148,6 +148,7 @@ gtk2_ardour_sources = [
'midi_streamview.cc',
'midi_time_axis.cc',
'midi_tracer.cc',
'midi_velocity_dialog.cc',
'missing_file_dialog.cc',
'missing_plugin_dialog.cc',
'mixer_actor.cc',
@ -156,6 +157,7 @@ gtk2_ardour_sources = [
'mixer_ui.cc',
'monitor_section.cc',
'mono_panner.cc',
'mono_panner_editor.cc',
'mouse_cursors.cc',
'nag.cc',
'new_plugin_preset_dialog.cc',
@ -164,6 +166,7 @@ gtk2_ardour_sources = [
'option_editor.cc',
'opts.cc',
'panner2d.cc',
'panner_editor.cc',
'panner_interface.cc',
'panner_ui.cc',
'piano_roll_header.cc',
@ -216,6 +219,7 @@ gtk2_ardour_sources = [
'step_editor.cc',
'step_entry.cc',
'stereo_panner.cc',
'stereo_panner_editor.cc',
'streamview.cc',
'strip_silence_dialog.cc',
'tape_region_view.cc',

4
libs/ardour/ardour/panner.h
View file

@ -71,6 +71,10 @@ public:
virtual bool clamp_width (double&) { return true; }
virtual bool clamp_elevation (double&) { return true; }
virtual std::pair<double, double> position_range () const { return std::make_pair (-DBL_MAX, DBL_MAX); }
virtual std::pair<double, double> width_range () const { return std::make_pair (-DBL_MAX, DBL_MAX); }
virtual std::pair<double, double> elevation_range () const { return std::make_pair (-DBL_MAX, DBL_MAX); }
virtual void set_position (double) { }
virtual void set_width (double) { }
virtual void set_elevation (double) { }

3
libs/ardour/ardour/session.h
View file

@ -177,9 +177,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
const SessionDirectory& session_directory () const { return *(_session_dir.get()); }
static PBD::Signal0<void> AutoBindingOn;
static PBD::Signal0<void> AutoBindingOff;
static PBD::Signal1<void,std::string> Dialog;
int ensure_subdirs ();

20
libs/ardour/audio_unit.cc
View file

@ -1019,7 +1019,8 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
vector<pair<int,int> >& io_configs = pinfo->cache.io_configs;
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations\n", name(), io_configs.size()));
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations, looking for %3 in, %4 out\n",
name(), io_configs.size(), in, out));
//Ardour expects the plugin to tell it the output
//configuration but AU plugins can have multiple I/O
@ -1034,7 +1035,13 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) con
int32_t possible_out = i->second;
if ((possible_in == audio_in) && (possible_out == audio_out)) {
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: in %1 out %2\n", in, out));
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: %1 in %2 out to match in %3 out %4\n",
possible_in, possible_out,
in, out));
out.set (DataType::MIDI, 0);
out.set (DataType::AUDIO, audio_out);
return 1;
}
}
@ -1300,9 +1307,14 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_
_last_nframes = nframes;
}
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6)\n",
name(), input_channels, output_channels, _has_midi_input,
bufs.count(), bufs.available()));
/* the apparent number of buffers matches our input configuration, but we know that the bufferset
has the capacity to handle our outputs.
*/
assert (bufs.available() >= ChanCount (DataType::AUDIO, output_channels));
input_buffers = &bufs;
@ -1310,10 +1322,6 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_
input_offset = offset;
cb_offset = 0;
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 in %2 out %3 MIDI %4 bufs %5 (available %6)\n",
name(), input_channels, output_channels, _has_midi_input,
bufs.count(), bufs.available()));
buffers->mNumberBuffers = output_channels;
for (int32_t i = 0; i < output_channels; ++i) {

1
libs/ardour/automation_list.cc
View file

@ -381,6 +381,7 @@ AutomationList::deserialize_events (const XMLNode& node)
int
AutomationList::set_state (const XMLNode& node, int version)
{
LocaleGuard lg (X_("POSIX"));
XMLNodeList nlist = node.children();
XMLNode* nsos;
XMLNodeIterator niter;

1
libs/ardour/globals.cc
View file

@ -382,6 +382,7 @@ ARDOUR::cleanup ()
#ifdef LXVST_SUPPORT
vstfx_exit();
#endif
EnumWriter::destroy ();
return 0;
}

1427
libs/ardour/po/es.po
View file

File diff suppressed because it is too large Load diff

2
libs/ardour/rb_effect.cc
View file

@ -388,8 +388,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
}
}
tsr.done = true;
return ret;
}

2
libs/ardour/session.cc
View file

@ -116,8 +116,6 @@ PBD::Signal3<int,Session*,std::string,DataType> Session::MissingFile;
PBD::Signal1<void, framepos_t> Session::StartTimeChanged;
PBD::Signal1<void, framepos_t> Session::EndTimeChanged;
PBD::Signal0<void> Session::AutoBindingOn;
PBD::Signal0<void> Session::AutoBindingOff;
PBD::Signal2<void,std::string, std::string> Session::Exported;
PBD::Signal1<int,boost::shared_ptr<Playlist> > Session::AskAboutPlaylistDeletion;
PBD::Signal0<void> Session::Quit;

2
libs/ardour/st_stretch.cc
View file

@ -203,7 +203,5 @@ STStretch::run (boost::shared_ptr<Region> a_region, Progress* progress)
}
}
tsr.done = true;
return ret;
}

6
libs/ardour/test/test_needing_session.cc
View file

@ -6,8 +6,6 @@
#include "ardour/audioengine.h"
#include "test_needing_session.h"
extern void setup_libpbd_enums ();
using namespace std;
using namespace ARDOUR;
using namespace PBD;
@ -56,11 +54,8 @@ TestNeedingSession::setUp ()
string const test_session_path = "libs/ardour/test/test_session";
system (string_compose ("rm -rf %1", test_session_path).c_str());
init (false, true);
SessionEvent::create_per_thread_pool ("test", 512);
setup_libpbd_enums ();
test_receiver.listen_to (error);
test_receiver.listen_to (info);
test_receiver.listen_to (fatal);
@ -83,7 +78,6 @@ TestNeedingSession::tearDown ()
delete _session;
EnumWriter::destroy ();
MIDI::Manager::destroy ();
AudioEngine::destroy ();
}

2
libs/ardour/test/testrunner.cc
View file

@ -61,5 +61,7 @@ main(int argc, char* argv[])
CppUnit::CompilerOutputter compileroutputter (&collectedresults, std::cerr);
compileroutputter.write ();
ARDOUR::cleanup ();
return collectedresults.wasSuccessful () ? 0 : 1;
}

14
libs/gtkmm2ext/actions.cc
View file

@ -344,8 +344,20 @@ ActionManager::set_sensitive (vector<RefPtr<Action> >& actions, bool state)
}
}
void
ActionManager::check_toggleaction (string n)
{
set_toggleaction_state (n, true);
}
void
ActionManager::uncheck_toggleaction (string n)
{
set_toggleaction_state (n, false);
}
void
ActionManager::set_toggleaction_state (string n, bool s)
{
char const * name = n.c_str ();
@ -369,7 +381,7 @@ ActionManager::uncheck_toggleaction (string n)
RefPtr<Action> act = get_action (group_name, action_name);
if (act) {
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
tact->set_active (false);
tact->set_active (s);
} else {
error << string_compose (_("Unknown action name: %1"), name) << endmsg;
}

2
libs/gtkmm2ext/gtkmm2ext/actions.h
View file

@ -86,7 +86,9 @@ namespace ActionManager {
std::vector<std::string>& tooltips,
std::vector<Gtk::AccelKey>& bindings);
extern void check_toggleaction (std::string);
extern void uncheck_toggleaction (std::string);
extern void set_toggleaction_state (std::string, bool);
};
#endif /* __libgtkmm2ext_actions_h__ */

2
libs/gtkmm2ext/gtkmm2ext/utils.h
View file

@ -106,6 +106,8 @@ namespace Gtkmm2ext {
void rounded_top_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
void rounded_bottom_half_rectangle (cairo_t*, double x, double y, double w, double h, double r=10);
Gtk::Label* left_aligned_label (std::string const &);
};
#endif /* __gtkmm2ext_utils_h__ */

54
libs/gtkmm2ext/po/es_ES.po
View file

@ -6,23 +6,22 @@ msgid ""
msgstr ""
"Project-Id-Version: gtkmm2ext\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-21 16:11-0500\n"
"PO-Revision-Date: 2004-02-13 00:35+0300\n"
"Last-Translator: Alex Krohn alexkrohn@fastmail.fm\n"
"POT-Creation-Date: 2012-06-06 18:02+0200\n"
"PO-Revision-Date: 2012-06-06 19:00+0100\n"
"Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
"Language-Team: Spanish\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: actions.cc:327
#: actions.cc:374
msgid "Unknown action name: %1"
msgstr ""
#: binding_proxy.cc:84
#, fuzzy
msgid "operate controller now"
msgstr "Operar controladora de MIDI ahora"
msgstr "Operar controlador ahora"
#: bindable_button.cc:48
msgid "button cannot watch state of non-existing Controllable\n"
@ -30,31 +29,44 @@ msgstr ""
#: gtk_ui.cc:105
msgid "Log"
msgstr "Log"
#: gtk_ui.cc:361
msgid ""
"\n"
"\n"
"Key: "
msgstr ""
#: gtk_ui.cc:624
#: gtk_ui.cc:634
msgid "Press To Exit"
msgstr ""
msgstr "Pulse para salir"
#: gtk_ui.cc:660
#: gtk_ui.cc:670
msgid "I'm sorry %1, I can't do that"
msgstr ""
msgstr "Lo siento %1, no puedo hacer eso"
#: keyboard.cc:68
msgid "Command"
msgstr ""
#: keyboard.cc:69 keyboard.cc:72 keyboard.cc:85 keyboard.cc:89
#: keyboard.cc:69
#: keyboard.cc:72
#: keyboard.cc:85
#: keyboard.cc:89
msgid "Control"
msgstr ""
#: keyboard.cc:70 keyboard.cc:73 keyboard.cc:87 keyboard.cc:90
msgid "Shift"
#: keyboard.cc:70
#: keyboard.cc:73
#: keyboard.cc:87
#: keyboard.cc:90
msgid "Key|Shift"
msgstr ""
#: keyboard.cc:71
msgid "Option"
msgstr ""
msgstr "Opción"
#: keyboard.cc:86
msgid "Alt"
@ -64,26 +76,30 @@ msgstr ""
msgid "Meta"
msgstr ""
#: keyboard.cc:131 keyboard.cc:506
#: keyboard.cc:134
#: keyboard.cc:515
msgid "Unknown"
msgstr ""
#: keyboard.cc:517
#: keyboard.cc:526
msgid "Ardour key bindings file not found at \"%1\" or contains errors."
msgstr ""
msgstr "El archivo de Ardour combinaciones de teclas de ardour no se encontró en \"%1\" o contiene errores."
#: tearoff.cc:57
msgid "Click to tear this into its own window"
msgstr ""
msgstr "Pulsa para tener esto en su propia ventana"
#: tearoff.cc:63
msgid "Click to put this back in the main window"
msgstr ""
msgstr "Pulsa para llevarlo a la ventana principal"
#: textviewer.cc:34
msgid "Close"
msgstr "Cerrar"
#~ msgid "Error"
#~ msgstr "Error"
#~ msgid "OK"
#~ msgstr "ACEPTAR"

7
libs/gtkmm2ext/utils.cc
View file

@ -624,3 +624,10 @@ Gtkmm2ext::fit_to_pixels (cairo_t* cr, std::string name, double avail)
return std::make_pair (name, width);
}
Gtk::Label *
Gtkmm2ext::left_aligned_label (string const & t)
{
Gtk::Label* l = new Gtk::Label (t);
l->set_alignment (0, 0.5);
return l;
}

2
libs/midi++2/midnam_patch.cc
View file

@ -236,7 +236,7 @@ PatchBank::set_state (const XMLTree& tree, const XMLNode& node)
} else {
XMLNode* use_patch_name_list = node.child ("UsesPatchNameList");
if (use_patch_name_list) {
_patch_list_name = node.property ("Name")->value();
_patch_list_name = use_patch_name_list->property ("Name")->value();
} else {
error << "Patch without patch name list - patchfile will be ignored" << endmsg;
return -1;

6
libs/panners/1in2out/panner_1in2out.cc
View file

@ -121,6 +121,12 @@ Panner1in2out::clamp_position (double& p)
return true;
}
pair<double, double>
Panner1in2out::position_range () const
{
return make_pair (0, 1);
}
double
Panner1in2out::position () const
{

1
libs/panners/1in2out/panner_1in2out.h
View file

@ -43,6 +43,7 @@ class Panner1in2out : public Panner
void set_position (double);
bool clamp_position (double&);
std::pair<double, double> position_range () const;
double position() const;

21
libs/panners/2in2out/panner_2in2out.cc
View file

@ -152,8 +152,8 @@ Panner2in2out::update ()
*/
float pos[2];
double width = _pannable->pan_width_control->get_value();
const double direction_as_lr_fract = _pannable->pan_azimuth_control->get_value();
double width = this->width ();
const double direction_as_lr_fract = position ();
if (width < 0.0) {
width = -width;
@ -189,17 +189,30 @@ Panner2in2out::update ()
bool
Panner2in2out::clamp_position (double& p)
{
double w = _pannable->pan_width_control->get_value();
double w = width ();
return clamp_stereo_pan (p, w);
}
bool
Panner2in2out::clamp_width (double& w)
{
double p = _pannable->pan_azimuth_control->get_value();
double p = position ();
return clamp_stereo_pan (p, w);
}
pair<double, double>
Panner2in2out::position_range () const
{
return make_pair (0.5 - (1 - width()) / 2, 0.5 + (1 - width()) / 2);
}
pair<double, double>
Panner2in2out::width_range () const
{
double const w = min (position(), (1 - position())) * 2;
return make_pair (-w, w);
}
bool
Panner2in2out::clamp_stereo_pan (double& direction_as_lr_fract, double& width)
{

3
libs/panners/2in2out/panner_2in2out.h
View file

@ -49,6 +49,9 @@ class Panner2in2out : public Panner
bool clamp_position (double&);
bool clamp_width (double&);
std::pair<double, double> position_range () const;
std::pair<double, double> width_range () const;
void set_position (double);
void set_width (double);

2
libs/soundgrid/driver.cc
View file

@ -95,7 +95,7 @@ WMSDErr
WMSD_SurfaceDisplayUpdate (const WSDSurfaceHandle /*surfaceHandle*/,
const struct WSControlID* /*pControlID*/)
{
DEBUG_TRACE (DEBUG::SoundGrid, string_compose ("SurfaceDriver:%1\n", __FUNCTION__));
// DEBUG_TRACE (DEBUG::SoundGrid, string_compose ("SurfaceDriver:%1\n", __FUNCTION__));
return eNoErr;
}

202
libs/surfaces/mackie/device_info.cc
View file

@ -61,46 +61,35 @@ DeviceInfo::~DeviceInfo()
{
}
std::string&
DeviceInfo::get_global_button_name(Button::ID id)
{
std::map<Button::ID,GlobalButtonInfo>::iterator it;
it = _global_buttons.find (id);
if (it == _global_buttons.end ()) {
_global_button_name = "";
return _global_button_name;
} else {
return it->second.label;
}
}
void
DeviceInfo::mackie_control_buttons ()
{
_global_buttons.clear ();
shared_buttons ();
_global_buttons[Button::Edit] = GlobalButtonInfo ("edit", "none", 0x33);
_global_buttons[Button::UserA] = GlobalButtonInfo ("Rear Panel User Switch 1", "user", 0x66);
_global_buttons[Button::UserB] = GlobalButtonInfo ("Rear Panel User Switch 2", "user", 0x67);
_global_buttons[Button::F9] = GlobalButtonInfo ("F9", "none", 0x3e);
_global_buttons[Button::F10] = GlobalButtonInfo ("F10", "none", 0x3f);
_global_buttons[Button::F11] = GlobalButtonInfo ("F11", "none", 0x40);
_global_buttons[Button::F12] = GlobalButtonInfo ("F12", "none", 0x41);
_global_buttons[Button::F13] = GlobalButtonInfo ("F13", "none", 0x42);
_global_buttons[Button::F14] = GlobalButtonInfo ("F14", "none", 0x43);
_global_buttons[Button::F15] = GlobalButtonInfo ("F15", "none", 0x44);
_global_buttons[Button::F16] = GlobalButtonInfo ("F16", "none", 0x45);
_global_buttons[Button::Ctrl] = GlobalButtonInfo ("ctrl", "modifiers", 0x46);
_global_buttons[Button::Option] = GlobalButtonInfo ("option", "modifiers", 0x47);
_global_buttons[Button::Snapshot] = GlobalButtonInfo ("snapshot", "modifiers", 0x48);
_global_buttons[Button::Shift] = GlobalButtonInfo ("shift", "modifiers", 0x49);
_global_buttons[Button::Read] = GlobalButtonInfo ("read", "automation", 0x4a);
_global_buttons[Button::Write] = GlobalButtonInfo ("write", "automation", 0x4b);
_global_buttons[Button::Undo] = GlobalButtonInfo ("undo", "functions", 0x4c);
_global_buttons[Button::Save] = GlobalButtonInfo ("save", "automation", 0x4d);
_global_buttons[Button::Touch] = GlobalButtonInfo ("touch", "automation", 0x4e);
_global_buttons[Button::Redo] = GlobalButtonInfo ("redo", "functions", 0x4f);
_global_buttons[Button::FdrGroup] = GlobalButtonInfo ("fader group", "functions", 0x50);
_global_buttons[Button::ClearSolo] = GlobalButtonInfo ("clear solo", "functions", 0x51);
_global_buttons[Button::Cancel] = GlobalButtonInfo ("cancel", "functions", 0x52);
_global_buttons[Button::Marker] = GlobalButtonInfo ("marker", "functions", 0x53);
_global_buttons[Button::Mixer] = GlobalButtonInfo ("mixer", "transport", 0x54);
_global_buttons[Button::FrmLeft] = GlobalButtonInfo ("frm left", "transport", 0x55);
_global_buttons[Button::FrmRight] = GlobalButtonInfo ("frm right", "transport", 0x56);
_global_buttons[Button::End] = GlobalButtonInfo ("end", "transport", 0x57);
_global_buttons[Button::PunchIn] = GlobalButtonInfo ("punch in", "transport", 0x58);
_global_buttons[Button::PunchOut] = GlobalButtonInfo ("punch out", "transport", 0x59);
_global_buttons[Button::Loop] = GlobalButtonInfo ("loop", "transport", 0x59);
_global_buttons[Button::Home] = GlobalButtonInfo ("home", "transport", 0x5a);
//TODO Implement "rear panel external control": a connection for a resistive
//TODO element expression pedal . Message: 0xb0 0x2e 0xVV where 0xVV = external
//TODO controller position value (0x00 to 0x7f)
_strip_buttons[Button::FaderTouch] = StripButtonInfo (0xe0, "fader touch");
_strip_buttons[Button::RecEnable] = StripButtonInfo (0x0, "Rec");
_strip_buttons[Button::FaderTouch] = StripButtonInfo (0xe0, "Fader Touch");
}
void
@ -109,86 +98,93 @@ DeviceInfo::logic_control_buttons ()
_global_buttons.clear ();
shared_buttons ();
_global_buttons[Button::View] = GlobalButtonInfo ("view", "view", 0x33);
_global_buttons[Button::UserA] = GlobalButtonInfo ("User Switch A", "user", 0x66);
_global_buttons[Button::UserB] = GlobalButtonInfo ("User Switch B", "user", 0x67);
_global_buttons[Button::MidiTracks] = GlobalButtonInfo ("miditracks", "view", 0x3e);
_global_buttons[Button::Inputs] = GlobalButtonInfo ("inputs", "view", 0x3f);
_global_buttons[Button::AudioTracks] = GlobalButtonInfo ("audiotracks", "view", 0x40);
_global_buttons[Button::AudioInstruments] = GlobalButtonInfo ("audio instruments", "view", 0x41);
_global_buttons[Button::Aux] = GlobalButtonInfo ("aux", "view", 0x42);
_global_buttons[Button::Busses] = GlobalButtonInfo ("busses", "view", 0x43);
_global_buttons[Button::Outputs] = GlobalButtonInfo ("outputs", "view", 0x44);
_global_buttons[Button::User] = GlobalButtonInfo ("user", "view", 0x45);
_global_buttons[Button::Shift] = GlobalButtonInfo ("shift", "modifiers", 0x46);
_global_buttons[Button::Option] = GlobalButtonInfo ("option", "modifiers", 0x47);
_global_buttons[Button::Ctrl] = GlobalButtonInfo ("ctrl", "modifiers", 0x48);
_global_buttons[Button::CmdAlt] = GlobalButtonInfo ("cmdalt", "modifiers", 0x49);
_global_buttons[Button::Read] = GlobalButtonInfo ("read", "automation", 0x4a);
_global_buttons[Button::Write] = GlobalButtonInfo ("write", "automation", 0x4b);
_global_buttons[Button::Trim] = GlobalButtonInfo ("trim", "automation", 0x4c);
_global_buttons[Button::Touch] = GlobalButtonInfo ("touch", "functions", 0x4d);
_global_buttons[Button::Latch] = GlobalButtonInfo ("latch", "functions", 0x4e);
_global_buttons[Button::Grp] = GlobalButtonInfo ("group", "functions", 0x4f);
_global_buttons[Button::Save] = GlobalButtonInfo ("save", "functions", 0x50);
_global_buttons[Button::Undo] = GlobalButtonInfo ("undo", "functions", 0x51);
_global_buttons[Button::Cancel] = GlobalButtonInfo ("cancel", "transport", 0x52);
_global_buttons[Button::Enter] = GlobalButtonInfo ("enter right", "transport", 0x53);
_global_buttons[Button::Marker] = GlobalButtonInfo ("marker", "transport", 0x54);
_global_buttons[Button::Nudge] = GlobalButtonInfo ("nudge", "transport", 0x55);
_global_buttons[Button::Loop] = GlobalButtonInfo ("cycle", "transport", 0x56);
_global_buttons[Button::Drop] = GlobalButtonInfo ("drop", "transport", 0x57);
_global_buttons[Button::Replace] = GlobalButtonInfo ("replace", "transport", 0x58);
_global_buttons[Button::Click] = GlobalButtonInfo ("click", "transport", 0x59);
_global_buttons[Button::Solo] = GlobalButtonInfo ("solo", "transport", 0x5a);
_strip_buttons[Button::FaderTouch] = StripButtonInfo (0x68, "fader touch");
_strip_buttons[Button::RecEnable] = StripButtonInfo (0x0, "Rec/Rdy");
_strip_buttons[Button::FaderTouch] = StripButtonInfo (0x68, "Fader Touch");
}
void
DeviceInfo::shared_buttons ()
{
_global_buttons[Button::Track] = GlobalButtonInfo ("track", "assignment", 0x28);
_global_buttons[Button::Send] = GlobalButtonInfo ("send", "assignment", 0x29);
_global_buttons[Button::Pan] = GlobalButtonInfo ("pan", "assignment", 0x2a);
_global_buttons[Button::Plugin] = GlobalButtonInfo ("plugin", "assignment", 0x2b);
_global_buttons[Button::Eq] = GlobalButtonInfo ("eq", "assignment", 0x2c);
_global_buttons[Button::Dyn] = GlobalButtonInfo ("dyn", "assignment", 0x2d);
_global_buttons[Button::Left] = GlobalButtonInfo ("left", "bank", 0x2e);
_global_buttons[Button::Right] = GlobalButtonInfo ("right", "bank", 0x2f);
_global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("channelleft", "bank", 0x30);
_global_buttons[Button::ChannelRight] = GlobalButtonInfo ("channelright", "bank", 0x31);
_global_buttons[Button::Flip] = GlobalButtonInfo ("flip", "none", 0x32);
_global_buttons[Button::Track] = GlobalButtonInfo ("Track", "assignment", 0x28);
_global_buttons[Button::Send] = GlobalButtonInfo ("Send", "assignment", 0x29);
_global_buttons[Button::Pan] = GlobalButtonInfo ("Pan/Surround", "assignment", 0x2a);
_global_buttons[Button::Plugin] = GlobalButtonInfo ("Plugin", "assignment", 0x2b);
_global_buttons[Button::Eq] = GlobalButtonInfo ("Eq", "assignment", 0x2c);
_global_buttons[Button::Dyn] = GlobalButtonInfo ("Instrument", "assignment", 0x2d);
_global_buttons[Button::NameValue] = GlobalButtonInfo ("name/value", "display", 0x34);
_global_buttons[Button::TimecodeBeats] = GlobalButtonInfo ("timecode/beats", "display", 0x35);
_global_buttons[Button::F1] = GlobalButtonInfo ("F1", "none", 0x36);
_global_buttons[Button::F2] = GlobalButtonInfo ("F2", "none", 0x37);
_global_buttons[Button::F3] = GlobalButtonInfo ("F3", "none", 0x38);
_global_buttons[Button::F4] = GlobalButtonInfo ("F4", "none", 0x39);
_global_buttons[Button::F5] = GlobalButtonInfo ("F5", "none", 0x3a);
_global_buttons[Button::F6] = GlobalButtonInfo ("F6", "none", 0x3b);
_global_buttons[Button::F7] = GlobalButtonInfo ("F7", "none", 0x3c);
_global_buttons[Button::F8] = GlobalButtonInfo ("F8", "none", 0x3d);
_global_buttons[Button::Left] = GlobalButtonInfo ("Bank Left", "bank", 0x2e);
_global_buttons[Button::Right] = GlobalButtonInfo ("Bank Right", "bank", 0x2f);
_global_buttons[Button::ChannelLeft] = GlobalButtonInfo ("Channel Left", "bank", 0x30);
_global_buttons[Button::ChannelRight] = GlobalButtonInfo ("Channel Right", "bank", 0x31);
_global_buttons[Button::Flip] = GlobalButtonInfo ("Flip", "assignment", 0x32);
_global_buttons[Button::View] = GlobalButtonInfo ("Global View", "global view", 0x33);
_global_buttons[Button::Rewind] = GlobalButtonInfo ("rewind", "transport", 0x5b);
_global_buttons[Button::Ffwd] = GlobalButtonInfo ("ffwd", "transport", 0x5c);
_global_buttons[Button::Stop] = GlobalButtonInfo ("stop", "transport", 0x5d);
_global_buttons[Button::Play] = GlobalButtonInfo ("play", "transport", 0x5e);
_global_buttons[Button::Record] = GlobalButtonInfo ("record", "transport", 0x5f);
_global_buttons[Button::CursorUp] = GlobalButtonInfo ("cursor up", "cursor", 0x60);
_global_buttons[Button::CursorDown] = GlobalButtonInfo ("cursor down", "cursor", 0x61);
_global_buttons[Button::CursorLeft] = GlobalButtonInfo ("cursor left", "cursor", 0x62);
_global_buttons[Button::CursorRight] = GlobalButtonInfo ("cursor right", "cursor", 0x63);
_global_buttons[Button::Zoom] = GlobalButtonInfo ("zoom", "none", 0x64);
_global_buttons[Button::Scrub] = GlobalButtonInfo ("scrub", "none", 0x65);
_global_buttons[Button::UserA] = GlobalButtonInfo ("user a", "user", 0x66);
_global_buttons[Button::UserB] = GlobalButtonInfo ("user b", "user", 0x67);
_global_buttons[Button::NameValue] = GlobalButtonInfo ("Name/Value", "display", 0x34);
_global_buttons[Button::TimecodeBeats] = GlobalButtonInfo ("Timecode/Beats", "display", 0x35);
_strip_buttons[Button::RecEnable] = StripButtonInfo (0x0, "recenable");
_strip_buttons[Button::Solo] = StripButtonInfo (0x08, "solo");
_strip_buttons[Button::Mute] = StripButtonInfo (0x10, "mute");
_strip_buttons[Button::Select] = StripButtonInfo (0x18, "select");
_strip_buttons[Button::VSelect] = StripButtonInfo (0x20, "vselect");
_global_buttons[Button::F1] = GlobalButtonInfo ("F1", "function select", 0x36);
_global_buttons[Button::F2] = GlobalButtonInfo ("F2", "function select", 0x37);
_global_buttons[Button::F3] = GlobalButtonInfo ("F3", "function select", 0x38);
_global_buttons[Button::F4] = GlobalButtonInfo ("F4", "function select", 0x39);
_global_buttons[Button::F5] = GlobalButtonInfo ("F5", "function select", 0x3a);
_global_buttons[Button::F6] = GlobalButtonInfo ("F6", "function select", 0x3b);
_global_buttons[Button::F7] = GlobalButtonInfo ("F7", "function select", 0x3c);
_global_buttons[Button::F8] = GlobalButtonInfo ("F8", "function select", 0x3d);
_global_buttons[Button::MidiTracks] = GlobalButtonInfo ("MIDI Tracks", "global view", 0x3e);
_global_buttons[Button::Inputs] = GlobalButtonInfo ("Inputs", "global view", 0x3f);
_global_buttons[Button::AudioTracks] = GlobalButtonInfo ("Audio Tracks", "global view", 0x40);
_global_buttons[Button::AudioInstruments] = GlobalButtonInfo ("Audio Instruments", "global view", 0x41);
_global_buttons[Button::Aux] = GlobalButtonInfo ("Aux", "global view", 0x42);
_global_buttons[Button::Busses] = GlobalButtonInfo ("Busses", "global view", 0x43);
_global_buttons[Button::Outputs] = GlobalButtonInfo ("Outputs", "global view", 0x44);
_global_buttons[Button::User] = GlobalButtonInfo ("User", "global view", 0x45);
_global_buttons[Button::Shift] = GlobalButtonInfo ("Shift", "modifiers", 0x46);
_global_buttons[Button::Option] = GlobalButtonInfo ("Option", "modifiers", 0x47);
_global_buttons[Button::Ctrl] = GlobalButtonInfo ("Ctrl", "modifiers", 0x48);
_global_buttons[Button::CmdAlt] = GlobalButtonInfo ("Cmd/Alt", "modifiers", 0x49);
_global_buttons[Button::Read] = GlobalButtonInfo ("Read/Off", "automation", 0x4a);
_global_buttons[Button::Write] = GlobalButtonInfo ("Write", "automation", 0x4b);
_global_buttons[Button::Trim] = GlobalButtonInfo ("Trim", "automation", 0x4c);
_global_buttons[Button::Touch] = GlobalButtonInfo ("Touch", "automation", 0x4d);
_global_buttons[Button::Latch] = GlobalButtonInfo ("Latch", "automation", 0x4e);
_global_buttons[Button::Grp] = GlobalButtonInfo ("Group", "automation", 0x4f);
_global_buttons[Button::Save] = GlobalButtonInfo ("Save", "utilities", 0x50);
_global_buttons[Button::Undo] = GlobalButtonInfo ("Undo", "utilities", 0x51);
_global_buttons[Button::Cancel] = GlobalButtonInfo ("Cancel", "utilities", 0x52);
_global_buttons[Button::Enter] = GlobalButtonInfo ("Enter", "utilities", 0x53);
_global_buttons[Button::Marker] = GlobalButtonInfo ("Marker", "transport", 0x54);
_global_buttons[Button::Nudge] = GlobalButtonInfo ("Nudge", "transport", 0x55);
_global_buttons[Button::Loop] = GlobalButtonInfo ("Cycle", "transport", 0x56);
_global_buttons[Button::Drop] = GlobalButtonInfo ("Drop", "transport", 0x57);
_global_buttons[Button::Replace] = GlobalButtonInfo ("Replace", "transport", 0x58);
_global_buttons[Button::Click] = GlobalButtonInfo ("Click", "transport", 0x59);
_global_buttons[Button::Solo] = GlobalButtonInfo ("Solo", "transport", 0x5a);
_global_buttons[Button::Rewind] = GlobalButtonInfo ("Rewind", "transport", 0x5b);
_global_buttons[Button::Ffwd] = GlobalButtonInfo ("Fast Fwd", "transport", 0x5c);
_global_buttons[Button::Stop] = GlobalButtonInfo ("Stop", "transport", 0x5d);
_global_buttons[Button::Play] = GlobalButtonInfo ("Play", "transport", 0x5e);
_global_buttons[Button::Record] = GlobalButtonInfo ("Record", "transport", 0x5f);
_global_buttons[Button::CursorUp] = GlobalButtonInfo ("Cursor Up", "cursor", 0x60);
_global_buttons[Button::CursorDown] = GlobalButtonInfo ("Cursor Down", "cursor", 0x61);
_global_buttons[Button::CursorLeft] = GlobalButtonInfo ("Cursor Left", "cursor", 0x62);
_global_buttons[Button::CursorRight] = GlobalButtonInfo ("Cursor Right", "cursor", 0x63);
_global_buttons[Button::Zoom] = GlobalButtonInfo ("Zoom", "cursor", 0x64);
_global_buttons[Button::Scrub] = GlobalButtonInfo ("Scrub", "cursor", 0x65);
_strip_buttons[Button::Solo] = StripButtonInfo (0x08, "Solo");
_strip_buttons[Button::Mute] = StripButtonInfo (0x10, "Mute");
_strip_buttons[Button::Select] = StripButtonInfo (0x18, "Select");
_strip_buttons[Button::VSelect] = StripButtonInfo (0x20, "V-Select");
}
int

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

@ -74,6 +74,8 @@ class DeviceInfo
static std::map<std::string,DeviceInfo> device_info;
static void reload_device_info();
std::string& get_global_button_name(Button::ID);
const std::map<Button::ID,GlobalButtonInfo>& global_buttons() const { return _global_buttons; }
const std::map<Button::ID,StripButtonInfo>& strip_buttons() const { return _strip_buttons; }
@ -91,6 +93,7 @@ class DeviceInfo
bool _no_handshake;
bool _has_meters;
std::string _name;
std::string _global_button_name;
std::map<Button::ID,GlobalButtonInfo> _global_buttons;
std::map<Button::ID,StripButtonInfo> _strip_buttons;

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

@ -167,6 +167,7 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
VBox* fkey_packer = manage (new VBox);
HBox* profile_packer = manage (new HBox);
HBox* observation_packer = manage (new HBox);
l = manage (new Gtk::Label (_("Profile/Settings:")));
profile_packer->pack_start (*l, false, false);
@ -174,8 +175,12 @@ MackieControlProtocolGUI::MackieControlProtocolGUI (MackieControlProtocol& p)
profile_packer->set_spacing (12);
profile_packer->set_border_width (12);
l = manage (new Gtk::Label (_("* Button available at the original Mackie MCU PRO or current device if enabled (NOT implemented yet). Device specific name presented.")));
observation_packer->pack_start (*l, false, false);
fkey_packer->pack_start (*profile_packer, false, false);
fkey_packer->pack_start (function_key_scroller, true, true);
fkey_packer->pack_start (*observation_packer, false, false);
fkey_packer->set_spacing (12);
function_key_scroller.set_size_request (700,700);
function_key_scroller.property_shadow_type() = Gtk::SHADOW_NONE;
@ -340,13 +345,18 @@ MackieControlProtocolGUI::refresh_function_key_editor ()
TreeModel::Row row;
DeviceProfile dp (_cp.device_profile());
DeviceInfo di;
for (int n = 0; n < Mackie::Button::FinalGlobalButton; ++n) {
Mackie::Button::ID bid = (Mackie::Button::ID) n;
row = *(function_key_model->append());
if (di.global_buttons().find (bid) == di.global_buttons().end()) {
row[function_key_columns.name] = Mackie::Button::id_to_name (bid);
} else {
row[function_key_columns.name] = di.get_global_button_name (bid) + "*";
}
row[function_key_columns.id] = bid;
Glib::RefPtr<Gtk::Action> act;

26
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -108,6 +108,7 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
, _ipmidi_base (MIDI::IPMIDIPort::lowest_ipmidi_port_default)
, needs_ipmidi_restart (false)
, _metering_active (true)
, _initialized (false)
{
DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::MackieControlProtocol\n");
@ -415,6 +416,10 @@ MackieControlProtocol::periodic ()
return true;
}
if (!_initialized) {
initialize();
}
struct timeval now;
uint64_t now_usecs;
gettimeofday (&now, 0);
@ -430,10 +435,10 @@ MackieControlProtocol::periodic ()
return true;
}
void
MackieControlProtocol::update_timecode_beats_led()
{
DEBUG_TRACE (DEBUG::MackieControl, string_compose("MackieControlProtocol::update_timecode_beats_led(): %1\n", _timecode_type));
switch (_timecode_type) {
case ARDOUR::AnyTime::BBT:
update_global_led (Led::Beats, on);
@ -473,6 +478,8 @@ MackieControlProtocol::update_global_led (int id, LedState ls)
{
boost::shared_ptr<Surface> surface = surfaces.front();
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("MackieControlProtocol::update_global_led (%1, %2)\n", id, ls));
if (surface->type() != mcu) {
return;
}
@ -480,6 +487,7 @@ MackieControlProtocol::update_global_led (int id, LedState ls)
map<int,Control*>::iterator x = surface->controls_by_device_independent_id.find (id);
if (x != surface->controls_by_device_independent_id.end()) {
Led * led = dynamic_cast<Led*> (x->second);
DEBUG_TRACE (DEBUG::MackieControl, "Writing LedState\n");
surface->write (led->set_state (ls));
} else {
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Led %1 not found\n", id));
@ -490,6 +498,7 @@ MackieControlProtocol::update_global_led (int id, LedState ls)
void
MackieControlProtocol::update_surfaces()
{
DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::update_surfaces() init\n");
if (!_active) {
return;
}
@ -498,6 +507,15 @@ MackieControlProtocol::update_surfaces()
// _current_initial_bank is initialised by set_state
switch_banks (_current_initial_bank, true);
DEBUG_TRACE (DEBUG::MackieControl, "MackieControlProtocol::update_surfaces() finished\n");
}
void
MackieControlProtocol::initialize()
{
if (!surfaces.front()->active ()) {
return;
}
// sometimes the jog wheel is a pot
surfaces.front()->blank_jog_ring ();
@ -506,6 +524,8 @@ MackieControlProtocol::update_surfaces()
notify_record_state_changed();
notify_transport_state_changed();
update_timecode_beats_led();
_initialized = true;
}
void
@ -755,8 +775,8 @@ MackieControlProtocol::format_timecode_timecode (framepos_t now_frame)
os << setw(2) << setfill('0') << timecode.hours;
os << setw(2) << setfill('0') << timecode.minutes;
os << setw(2) << setfill('0') << timecode.seconds;
os << ' ';
os << setw(2) << setfill('0') << timecode.frames;
os << ' ';
return os.str();
}
@ -881,7 +901,7 @@ MackieControlProtocol::notify_transport_state_changed()
// switch various play and stop buttons on / off
update_global_button (Button::Loop, session->get_play_loop());
update_global_button (Button::Play, session->transport_speed() == 1.0);
update_global_button (Button::Stop, !session->transport_rolling());
update_global_button (Button::Stop, session->transport_stopped ());
update_global_button (Button::Rewind, session->transport_speed() < 0.0);
update_global_button (Button::Ffwd, session->transport_speed() > 1.0);

2
libs/surfaces/mackie/mackie_control_protocol.h
View file

@ -289,6 +289,7 @@ class MackieControlProtocol
int16_t _ipmidi_base;
bool needs_ipmidi_restart;
bool _metering_active;
bool _initialized;
ARDOUR::RouteNotificationList _last_selected_routes;
@ -302,6 +303,7 @@ class MackieControlProtocol
void gui_track_selection_changed (ARDOUR::RouteNotificationListPtr, bool save_list);
void _gui_track_selection_changed (ARDOUR::RouteNotificationList*, bool save_list);
void ipmidi_restart ();
void initialize ();
/* BUTTON HANDLING */

35
libs/surfaces/mackie/surface.cc
View file

@ -71,12 +71,15 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui
/* only the first Surface object has global controls */
if (_number == 0) {
DEBUG_TRACE (DEBUG::MackieControl, "Surface has global controls\n");
if (_mcp.device_info().has_global_controls()) {
init_controls ();
DEBUG_TRACE (DEBUG::MackieControl, "init_controls done\n");
}
if (_mcp.device_info().has_master_fader()) {
setup_master ();
DEBUG_TRACE (DEBUG::MackieControl, "setup_master done\n");
}
}
@ -84,6 +87,7 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui
if (n) {
init_strips (n);
DEBUG_TRACE (DEBUG::MackieControl, "init_strips done\n");
}
connect_to_signals ();
@ -137,23 +141,27 @@ Surface::init_controls()
{
Group* group;
DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: creating groups\n");
groups["assignment"] = new Group ("assignment");
groups["automation"] = new Group ("automation");
groups["bank"] = new Group ("bank");
groups["cursor"] = new Group ("cursor");
groups["display"] = new Group ("display");
groups["functions"] = new Group ("functions");
groups["function select"] = new Group ("function select");
groups["global view"] = new Group ("global view");
groups["master"] = new Group ("master");
groups["modifiers"] = new Group ("modifiers");
groups["none"] = new Group ("none");
groups["transport"] = new Group ("transport");
groups["user"] = new Group ("user");
groups["master"] = new Group ("master");
groups["view"] = new Group ("view");
groups["utilities"] = new Group ("utilities");
DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: creating jog wheel\n");
if (_mcp.device_info().has_jog_wheel()) {
_jog_wheel = new Mackie::JogWheel (_mcp);
}
DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: creating global controls\n");
for (uint32_t n = 0; mackie_global_controls[n].name[0]; ++n) {
group = groups[mackie_global_controls[n].group_name];
Control* control = mackie_global_controls[n].factory (*this, mackie_global_controls[n].id, mackie_global_controls[n].name, *group);
@ -161,7 +169,7 @@ Surface::init_controls()
}
/* add global buttons */
DEBUG_TRACE (DEBUG::MackieControl, "Surface::init_controls: adding global buttons\n");
const map<Button::ID,GlobalButtonInfo>& global_buttons (_mcp.device_info().global_buttons());
for (map<Button::ID,GlobalButtonInfo>::const_iterator b = global_buttons.begin(); b != global_buttons.end(); ++b){
@ -508,7 +516,19 @@ Surface::host_connection_confirmation (const MidiByteArray & bytes)
void
Surface::turn_it_on ()
{
if (!_active) {
if (_active) {
return;
if (_mcp.device_info ().has_master_fader ()) {
master_gain_changed ();
}
if (_mcp.device_info ().has_global_controls ()) {
_mcp.update_global_button (Button::Read, _mcp.metering_active ());
_mcp.update_global_button (Button::Stop, _mcp.get_session ().transport_stopped ());
_mcp.update_global_button (Button::Play, (_mcp.get_session ().transport_speed () == 1.0f));
}
}
_active = true;
zero_controls ();
for (Strips::iterator s = strips.begin(); s != strips.end(); ++s) {
@ -521,9 +541,6 @@ Surface::turn_it_on ()
if (_mcp.device_info ().has_global_controls ()) {
_mcp.update_global_button (Button::Read, _mcp.metering_active ());
_mcp.update_global_button (Button::Stop, _mcp.get_session ().transport_stopped ());
_mcp.update_global_button (Button::Play, (_mcp.get_session ().transport_speed () == 1.0f));
}
}
}
@ -635,7 +652,9 @@ Surface::periodic (uint64_t now_usecs)
void
Surface::write (const MidiByteArray& data)
{
DEBUG_TRACE (DEBUG::MackieControl, string_compose ("Surface::write for %1\n", data));
if (_active) {
DEBUG_TRACE (DEBUG::MackieControl, "Surface::write surface active\n");
_port->write (data);
}
}

15
patchfiles/Korg Karma.midnam
View file

@ -47,21 +47,6 @@
<AvailableChannel Channel="15" Available="true" />
<AvailableChannel Channel="16" Available="true" />
</AvailableForChannels>
<PatchBank Name="Combinations 0000" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="0" />
<ControlChange Control="32" Value="0" />
</MIDICommands>
<UsesPatchNameList Name="Combinations 0000" />
</PatchBank>
<PatchBank Name="Combinations 0001" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="0" />
<ControlChange Control="32" Value="1" />
</MIDICommands>
<UsesPatchNameList Name="Combinations 0001" />
</PatchBank>
</ChannelNameSet>
<ChannelNameSet Name="Programs">

15
patchfiles/Korg_Triton.midnam
View file

@ -49,21 +49,6 @@
<AvailableChannel Channel="15" Available="true" />
<AvailableChannel Channel="16" Available="true" />
</AvailableForChannels>
<PatchBank Name="Combinations 0000" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="0" />
<ControlChange Control="32" Value="0" />
</MIDICommands>
<UsesPatchNameList Name="Combinations 0000" />
</PatchBank>
<PatchBank Name="Combinations 0001" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="0" />
<ControlChange Control="32" Value="1" />
</MIDICommands>
<UsesPatchNameList Name="Combinations 0001" />
</PatchBank>
</ChannelNameSet>
<ChannelNameSet Name="Programs">

29
patchfiles/Roland JP-8080.midnam
View file

@ -98,28 +98,6 @@
<AvailableChannel Channel="15" Available="true" />
<AvailableChannel Channel="16" Available="true" />
</AvailableForChannels>
<PatchBank Name="User Performances" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="85" />
<ControlChange Control="32" Value="0" />
</MIDICommands>
<UsesPatchNameList Name="User Performances" />
</PatchBank>
<PatchBank Name="Preset A Performances" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="85" />
<ControlChange Control="32" Value="64" />
</MIDICommands>
<UsesPatchNameList Name="Preset A Performances" />
</PatchBank>
<PatchBank Name="Preset B Performances" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="85" />
<ControlChange Control="32" Value="65" />
</MIDICommands>
<UsesPatchNameList Name="Preset B Performances" />
</PatchBank>
</ChannelNameSet>
<ChannelNameSet Name="Drums">
@ -142,13 +120,6 @@
<AvailableChannel Channel="16" Available="true" />
</AvailableForChannels>
<PatchBank Name="User Drums" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="86" />
<ControlChange Control="32" Value="0" />
</MIDICommands>
<UsesPatchNameList Name="User Drums" />
</PatchBank>
</ChannelNameSet>
<PatchNameList Name="User Patches">

14
patchfiles/Roland XV-3080.midnam
View file

@ -431,20 +431,6 @@
</MIDICommands>
<UsesPatchNameList Name="Techno Drums" />
</PatchBank>
<PatchBank Name="Dynamic Drums 1" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="92" />
<ControlChange Control="32" Value="0" />
</MIDICommands>
<UsesPatchNameList Name="Dynamic Drums 1 Patches" />
</PatchBank>
<PatchBank Name="Dynamic Drums 2" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="93" />
<ControlChange Control="32" Value="0" />
</MIDICommands>
<UsesPatchNameList Name="Dynamic Drums 2 Patches" />
</PatchBank>
<PatchBank Name="Studio SRX Drums" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="92" />

7
patchfiles/Roland_JV-1010.midnam
View file

@ -142,13 +142,6 @@
</MIDICommands>
<UsesPatchNameList Name="Performances PR-A" />
</PatchBank>
<PatchBank Name="Performances PR-B" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="81" />
<ControlChange Control="32" Value="1" />
</MIDICommands>
<UsesPatchNameList Name="Performances PR-B" />
</PatchBank>
</ChannelNameSet>
<ChannelNameSet Name="Drums">

7
patchfiles/korg_trinity_rack.midnam
View file

@ -55,13 +55,6 @@
</MIDICommands>
<UsesPatchNameList Name="Combinations 0000" />
</PatchBank>
<PatchBank Name="Combinations 0001" ROM="false">
<MIDICommands>
<ControlChange Control="0" Value="0" />
<ControlChange Control="32" Value="1" />
</MIDICommands>
<UsesPatchNameList Name="Combinations 0001" />
</PatchBank>
</ChannelNameSet>
<ChannelNameSet Name="Programs">

36
templates/16 Tracks/16 Tracks.template.in
View file

@ -53,7 +53,7 @@
<Connections/>
<Routes>
<Route flags="MasterOut" default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=0:signal=0">
<IO name="master" id="1088698373992392" inputs="{Audio 16/out 1,Audio 15/out 1,Audio 14/out 1,Audio 13/out 1,Audio 12/out 1,Audio 11/out 1,Audio 10/out 1,Audio 9/out 1,Audio 8/out 1,Audio 7/out 1,Audio 6/out 1,Audio 5/out 1,Audio 4/out 1,Audio 3/out 1,Audio 2/out 1,Audio 1/out 1}{Audio 16/out 2,Audio 15/out 2,Audio 14/out 2,Audio 13/out 2,Audio 12/out 2,Audio 11/out 2,Audio 10/out 2,Audio 9/out 2,Audio 8/out 2,Audio 7/out 2,Audio 6/out 2,Audio 5/out 2,Audio 4/out 2,Audio 3/out 2,Audio 2/out 2,Audio 1/out 2}" outputs="{%JACK_INPUT%1}{%JACK_INPUT%2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<IO name="master" id="1088698373992392" inputs="{Audio 16/out 1,Audio 15/out 1,Audio 14/out 1,Audio 13/out 1,Audio 12/out 1,Audio 11/out 1,Audio 10/out 1,Audio 9/out 1,Audio 8/out 1,Audio 7/out 1,Audio 6/out 1,Audio 5/out 1,Audio 4/out 1,Audio 3/out 1,Audio 2/out 1,Audio 1/out 1}{Audio 16/out 2,Audio 15/out 2,Audio 14/out 2,Audio 13/out 2,Audio 12/out 2,Audio 11/out 2,Audio 10/out 2,Audio 9/out 2,Audio 8/out 2,Audio 7/out 2,Audio 6/out 2,Audio 5/out 2,Audio 4/out 2,Audio 3/out 2,Audio 2/out 2,Audio 1/out 2}" outputs="{@JACK_INPUT@1}{@JACK_INPUT@2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -83,7 +83,7 @@
</extra>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=1:signal=1" mode="Normal" diskstream-id="1088698381595945">
<IO name="Audio 1" id="1088698381595877" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 1" id="1088698381595877" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -115,7 +115,7 @@
<controllable name="recenable" id="1191241279"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" mode="Normal" diskstream-id="1088698381722129">
<IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 2" id="1088698381722065" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -147,7 +147,7 @@
<controllable name="recenable" id="1191241292"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=3:signal=3" mode="Normal" diskstream-id="1088698419793849">
<IO name="Audio 3" id="1088698419793786" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 3" id="1088698419793786" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -179,7 +179,7 @@
<controllable name="recenable" id="1191241305"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=4:signal=4" mode="Normal" diskstream-id="1088698419943526">
<IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 4" id="1088698419943460" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -211,7 +211,7 @@
<controllable name="recenable" id="1191241318"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=5:signal=5" mode="Normal" diskstream-id="1088698450528071">
<IO name="Audio 5" id="1088698450528006" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 5" id="1088698450528006" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -243,7 +243,7 @@
<controllable name="recenable" id="1191241331"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=6:signal=6" mode="Normal" diskstream-id="1088698450754348">
<IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 6" id="1088698450754242" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -275,7 +275,7 @@
<controllable name="recenable" id="1191241344"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=7:signal=7" mode="Normal" diskstream-id="1088698450937150">
<IO name="Audio 7" id="1088698450937083" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 7" id="1088698450937083" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -307,7 +307,7 @@
<controllable name="recenable" id="1191241357"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=8:signal=8" mode="Normal" diskstream-id="1088698451167172">
<IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 8" id="1088698451167106" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -339,7 +339,7 @@
<controllable name="recenable" id="1191241370"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=9:signal=9" mode="Normal" diskstream-id="1088698483525991">
<IO name="Audio 9" id="1088698483525928" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 9" id="1088698483525928" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -371,7 +371,7 @@
<controllable name="recenable" id="1191241383"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=10:signal=10" mode="Normal" diskstream-id="1088698483801345">
<IO name="Audio 10" id="1088698483801234" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 10" id="1088698483801234" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -403,7 +403,7 @@
<controllable name="recenable" id="1191241396"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=11:signal=11" mode="Normal" diskstream-id="1088698484086727">
<IO name="Audio 11" id="1088698484086663" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 11" id="1088698484086663" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -435,7 +435,7 @@
<controllable name="recenable" id="1191241409"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=12:signal=12" mode="Normal" diskstream-id="1088698484325738">
<IO name="Audio 12" id="1088698484325672" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 12" id="1088698484325672" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -467,7 +467,7 @@
<controllable name="recenable" id="1191241422"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=13:signal=13" mode="Normal" diskstream-id="1088698484576054">
<IO name="Audio 13" id="1088698484575978" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 13" id="1088698484575978" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -499,7 +499,7 @@
<controllable name="recenable" id="1191241435"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=14:signal=14" mode="Normal" diskstream-id="1088698484839332">
<IO name="Audio 14" id="1088698484839137" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 14" id="1088698484839137" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -531,7 +531,7 @@
<controllable name="recenable" id="1191241448"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=15:signal=15" mode="Normal" diskstream-id="1088698485116518">
<IO name="Audio 15" id="1088698485116451" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 15" id="1088698485116451" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -563,7 +563,7 @@
<controllable name="recenable" id="1191241461"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=16:signal=16" mode="Normal" diskstream-id="1088698485412133">
<IO name="Audio 16" id="1088698485412068" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 16" id="1088698485412068" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -600,7 +600,7 @@
<Playlists/>
<UnusedPlaylists/>
<Click>
<IO name="click" id="1088698373994975" inputs="" outputs="{%JACK_INPUT%1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<IO name="click" id="1088698373994975" inputs="" outputs="{@JACK_INPUT@1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no"/>
<controllable name="gaincontrol" id="1191241476"/>
</IO>

8
templates/2 Track/2 Track.template.in
View file

@ -39,7 +39,7 @@
<Connections/>
<Routes>
<Route flags="MasterOut" default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=0:signal=0">
<IO name="master" id="1088698373992392" inputs="{Audio 2/out 1,Audio 1/out 1}{Audio 2/out 2,Audio 1/out 2}" outputs="{%JACK_INPUT%1}{%JACK_INPUT%2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<IO name="master" id="1088698373992392" inputs="{Audio 2/out 1,Audio 1/out 1}{Audio 2/out 2,Audio 1/out 2}" outputs="{@JACK_INPUT@1}{@JACK_INPUT@2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -69,7 +69,7 @@
</extra>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=1:signal=1" mode="Normal" diskstream-id="1088698381595945">
<IO name="Audio 1" id="1088698381595877" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 1" id="1088698381595877" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -101,7 +101,7 @@
<controllable name="recenable" id="1191241044"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" mode="Normal" diskstream-id="1088698381722129">
<IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 2" id="1088698381722065" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -138,7 +138,7 @@
<Playlists/>
<UnusedPlaylists/>
<Click>
<IO name="click" id="1088698373994975" inputs="" outputs="{%JACK_INPUT%1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<IO name="click" id="1088698373994975" inputs="" outputs="{@JACK_INPUT@1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no"/>
<controllable name="gaincontrol" id="1191241059"/>
</IO>

12
templates/4 Tracks/4 Tracks.template.in
View file

@ -41,7 +41,7 @@
<Connections/>
<Routes>
<Route flags="MasterOut" default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=0:signal=0">
<IO name="master" id="1088698373992392" inputs="{Audio 4/out 1,Audio 3/out 1,Audio 2/out 1,Audio 1/out 1}{Audio 4/out 2,Audio 3/out 2,Audio 2/out 2,Audio 1/out 2}" outputs="{%JACK_INPUT%1}{%JACK_INPUT%2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<IO name="master" id="1088698373992392" inputs="{Audio 4/out 1,Audio 3/out 1,Audio 2/out 1,Audio 1/out 1}{Audio 4/out 2,Audio 3/out 2,Audio 2/out 2,Audio 1/out 2}" outputs="{@JACK_INPUT@1}{@JACK_INPUT@2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -71,7 +71,7 @@
</extra>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=1:signal=1" mode="Normal" diskstream-id="1088698381595945">
<IO name="Audio 1" id="1088698381595877" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 1" id="1088698381595877" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -103,7 +103,7 @@
<controllable name="recenable" id="1191241132"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" mode="Normal" diskstream-id="1088698381722129">
<IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 2" id="1088698381722065" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -135,7 +135,7 @@
<controllable name="recenable" id="1191241145"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=3:signal=3" mode="Normal" diskstream-id="1088698419793849">
<IO name="Audio 3" id="1088698419793786" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 3" id="1088698419793786" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -167,7 +167,7 @@
<controllable name="recenable" id="1191241158"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=4:signal=4" mode="Normal" diskstream-id="1088698419943526">
<IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 4" id="1088698419943460" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -204,7 +204,7 @@
<Playlists/>
<UnusedPlaylists/>
<Click>
<IO name="click" id="1088698373994975" inputs="" outputs="{%JACK_INPUT%1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<IO name="click" id="1088698373994975" inputs="" outputs="{@JACK_INPUT@1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no"/>
<controllable name="gaincontrol" id="1191241173"/>
</IO>

20
templates/8 Tracks/8 Tracks.template.in
View file

@ -45,7 +45,7 @@
<Connections/>
<Routes>
<Route flags="MasterOut" default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=0:signal=0">
<IO name="master" id="1088698373992392" inputs="{Audio 8/out 1,Audio 7/out 1,Audio 6/out 1,Audio 5/out 1,Audio 4/out 1,Audio 3/out 1,Audio 2/out 1,Audio 1/out 1}{Audio 8/out 2,Audio 7/out 2,Audio 6/out 2,Audio 5/out 2,Audio 4/out 2,Audio 3/out 2,Audio 2/out 2,Audio 1/out 2}" outputs="{%JACK_INPUT%1}{%JACK_INPUT%2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<IO name="master" id="1088698373992392" inputs="{Audio 8/out 1,Audio 7/out 1,Audio 6/out 1,Audio 5/out 1,Audio 4/out 1,Audio 3/out 1,Audio 2/out 1,Audio 1/out 1}{Audio 8/out 2,Audio 7/out 2,Audio 6/out 2,Audio 5/out 2,Audio 4/out 2,Audio 3/out 2,Audio 2/out 2,Audio 1/out 2}" outputs="{@JACK_INPUT@1}{@JACK_INPUT@2}" gain="1.000000000000" iolimits="-1,2,-1,2">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -75,7 +75,7 @@
</extra>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=1:signal=1" mode="Normal" diskstream-id="1088698381595945">
<IO name="Audio 1" id="1088698381595877" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 1" id="1088698381595877" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -107,7 +107,7 @@
<controllable name="recenable" id="1191241193"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" mode="Normal" diskstream-id="1088698381722129">
<IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 2" id="1088698381722065" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -139,7 +139,7 @@
<controllable name="recenable" id="1191241206"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=3:signal=3" mode="Normal" diskstream-id="1088698419793849">
<IO name="Audio 3" id="1088698419793786" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 3" id="1088698419793786" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -171,7 +171,7 @@
<controllable name="recenable" id="1191241219"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=4:signal=4" mode="Normal" diskstream-id="1088698419943526">
<IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 4" id="1088698419943460" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -203,7 +203,7 @@
<controllable name="recenable" id="1191241232"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=5:signal=5" mode="Normal" diskstream-id="1088698450528071">
<IO name="Audio 5" id="1088698450528006" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 5" id="1088698450528006" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -235,7 +235,7 @@
<controllable name="recenable" id="1191241245"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=6:signal=6" mode="Normal" diskstream-id="1088698450754348">
<IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 6" id="1088698450754242" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -267,7 +267,7 @@
<controllable name="recenable" id="1191241258"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=7:signal=7" mode="Normal" diskstream-id="1088698450937150">
<IO name="Audio 7" id="1088698450937083" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 7" id="1088698450937083" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -299,7 +299,7 @@
<controllable name="recenable" id="1191241271"/>
</Route>
<Route default-type="audio" active="yes" muted="no" soloed="no" phase-invert="no" denormal-protection="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=8:signal=8" mode="Normal" diskstream-id="1088698451167172">
<IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<IO name="Audio 8" id="1088698451167106" inputs="{@JACK_OUTPUT@1}{@JACK_OUTPUT@2}" outputs="{master/in 1}{master/in 2}" gain="1.000000000000" iolimits="1,-1,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no">
<Output x="0" y="0"/>
<Output x="1" y="0"/>
@ -336,7 +336,7 @@
<Playlists/>
<UnusedPlaylists/>
<Click>
<IO name="click" id="1088698373994975" inputs="" outputs="{%JACK_INPUT%1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<IO name="click" id="1088698373994975" inputs="" outputs="{@JACK_INPUT@1}" gain="1.000000000000" iolimits="0,0,-1,-1">
<Panner linked="no" link_direction="SameDirection" bypassed="no"/>
<controllable name="gaincontrol" id="1191241286"/>
</IO>

21
templates/wscript
View file

@ -10,24 +10,21 @@ def configure(conf):
def build(bld):
subst_dict = {}
if bld.is_defined('COREAUDIO_SUPPORT'):
subst_dict['%JACK_INPUT%'] = 'coreaudio:Built-in Audio:in'
subst_dict['%JACK_OUTPUT%'] = 'coreaudio:Built-in Audio:out'
subst_dict = {'JACK_INPUT': 'coreaudio:Built-in Audio:in', 'JACK_OUTPUT': 'coreaudio:Built-in Audio:out'}
else:
subst_dict['%JACK_INPUT%'] = 'alsa_pcm:playback_'
subst_dict['%JACK_OUTPUT%'] = 'alsa_pcm:capture_'
subst_dict = {'JACK_INPUT': 'system:playback_','JACK_OUTPUT': 'system:capture_'}
templates = bld.path.ant_glob('*.template.in')
templates = bld.path.ant_glob('*/*.template.in')
for t in templates:
obj = bld(features = 'subst')
obj.name = 'template'
obj.source = [ t ]
dir_name = os.path.basename(t.srcpath()).replace('.template.in', '')
file_name = os.path.basename(t.srcpath()).replace('.in', '')
obj.target = [ os.path.join(dir_name, file_name) ]
obj.dict = subst_dict
obj.install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name))
obj = bld(features = 'subst',
name = 'template',
source = [ t ],
target = [ os.path.join(dir_name, file_name) ],
install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name)))
obj.__dict__.update(subst_dict)
def options(opt):
pass