mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
Committed filthy mess of a working copy solely for moving between machines.
Nothing to see here, move along now... git-svn-id: svn://localhost/trunk/ardour2midi@575 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
parent
0c1b9afc63
commit
74dd5bd706
51 changed files with 829 additions and 1033 deletions
|
|
@ -1,6 +1,6 @@
|
|||
#export G_DEBUG=fatal_criticals
|
||||
|
||||
export ARDOUR_PATH=./glade:./pixmaps:.:..
|
||||
export ARDOUR_PATH=./glade:./pixmaps:.
|
||||
|
||||
export LD_LIBRARY_PATH=../libs/surfaces/control_protocol:../libs/ardour:../libs/midi++2:../libs/pbd3:../libs/soundtouch:../libs/gtkmm2ext:../libs/sigc++2:../libs/glibmm2:../libs/gtkmm2/atk:../libs/gtkmm2/pango:../libs/gtkmm2/gdk:../libs/gtkmm2/gtk:../libs/libgnomecanvasmm:../libs/libglademm:$LD_LIBRARY_PATH
|
||||
|
||||
|
|
|
|||
|
|
@ -81,16 +81,20 @@ style "time_axis_view_item_name"
|
|||
style "default_base" = "medium_text"
|
||||
{
|
||||
GtkWidget::cursor_color = {1.0, 1.0, 1.0 }
|
||||
GtkButton::default_border = { 0, 0, 0, 0 }
|
||||
GtkButton::default_outside_border = { 0, 0, 0, 0 }
|
||||
GtkTreeView::vertical-padding = 0
|
||||
GtkTreeView::horizontal-padding = 0
|
||||
|
||||
fg[NORMAL] = { 0.80, 0.80, 0.80 }
|
||||
fg[ACTIVE] = { 0.80, 0.80, 0.80 }
|
||||
fg[PRELIGHT] = { 0.50, 1.0, 1.0 }
|
||||
fg[PRELIGHT] = { 1.0, 1.0, 1.0 }
|
||||
fg[INSENSITIVE] = { 0.80, 0.80, 0.80 }
|
||||
fg[SELECTED] = { 0.80, 0.80, 0.80 }
|
||||
|
||||
bg[NORMAL] = { 0.40, 0.40, 0.40 }
|
||||
bg[ACTIVE] = { 0.40, 0.40, 0.40 }
|
||||
bg[PRELIGHT] = { 0.40, 0.40, 0.40 }
|
||||
bg[PRELIGHT] = "#565690"
|
||||
bg[INSENSITIVE] = { 0.10, 0.10, 0.10 }
|
||||
bg[SELECTED] = { 0, 0.40, 0.60 }
|
||||
|
||||
|
|
@ -105,6 +109,13 @@ style "default_base" = "medium_text"
|
|||
base[PRELIGHT] = { 0.20, 0.20, 0.20 }
|
||||
base[INSENSITIVE] = "#4c5159"
|
||||
base[SELECTED] = { 0.25, 0.25, 0.25 }
|
||||
|
||||
engine "clearlooks" {
|
||||
menubarstyle = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
|
||||
menuitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient), 2 = 3d-ish (button)
|
||||
listviewitemstyle = 1 # 0 = flat, 1 = 3d-ish (gradient)
|
||||
progressbarstyle = 0 # 0 = candy bar, 1 = flat
|
||||
}
|
||||
}
|
||||
|
||||
style "base_frame"
|
||||
|
|
@ -131,11 +142,11 @@ style "black_mackie_menu_bar" = "medium_bold_text"
|
|||
style "default_buttons_menus"
|
||||
{
|
||||
font_name = "sans 8"
|
||||
fg[ACTIVE] = { 0, 0, 0 }
|
||||
fg[ACTIVE] = { 1.0, 1.0, 1.0 }
|
||||
|
||||
bg[NORMAL] = { 0.25, 0.25, 0.25 }
|
||||
bg[ACTIVE] = { 0.50, 1.0, 1.0 }
|
||||
bg[PRELIGHT] = { 0.15, 0.15, 0.15 }
|
||||
bg[NORMAL] = { 0.35, 0.35, 0.35 }
|
||||
bg[ACTIVE] = "#565690"
|
||||
bg[PRELIGHT] = { 0.20, 0.20, 0.20 }
|
||||
bg[INSENSITIVE] = { 0.20, 0.20, 0.20 }
|
||||
bg[SELECTED] = { 0.20, 0.20, 0.20 }
|
||||
}
|
||||
|
|
@ -239,6 +250,7 @@ style "time_button" = "default_buttons_menus"
|
|||
style "transport_button"
|
||||
{
|
||||
bg[ACTIVE] = { 0.50, 1.0, 0.50 }
|
||||
fg[ACTIVE] = { 0, 0, 0 }
|
||||
}
|
||||
|
||||
style "transport_rec_button"
|
||||
|
|
@ -853,8 +865,8 @@ style "region_list_whole_file"
|
|||
|
||||
style "ardour_button" ="default_buttons_menus"
|
||||
{
|
||||
xthickness = 0
|
||||
ythickness = 2
|
||||
xthickness = 1
|
||||
ythickness = 1
|
||||
}
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -409,7 +409,7 @@ If you still wish to quit, please use the\n\n\
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Config->save_state();
|
||||
quit ();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,24 +39,48 @@ using namespace ARDOUR;
|
|||
void
|
||||
ARDOUR_UI::setup_config_options ()
|
||||
{
|
||||
std::vector<Glib::ustring> groups;
|
||||
groups.push_back("options");
|
||||
groups.push_back("Editor");
|
||||
|
||||
struct {
|
||||
char* name;
|
||||
bool (Configuration::*method)(void) const;
|
||||
char act_type; // (t)oggle or (r)adio
|
||||
} options[] = {
|
||||
{ "ToggleTimeMaster", &Configuration::get_jack_time_master },
|
||||
{ "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport },
|
||||
{ "LatchedRecordEnable", &Configuration::get_latched_record_enable },
|
||||
{ "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture },
|
||||
{ "StopRecordingOnXrun", &Configuration::get_stop_recording_on_xrun },
|
||||
{ "StopTransportAtEndOfSession", &Configuration::get_stop_at_session_end },
|
||||
{ 0, 0 }
|
||||
{ "ToggleTimeMaster", &Configuration::get_jack_time_master, 't' },
|
||||
{ "StopPluginsWithTransport", &Configuration::get_plugins_stop_with_transport, 't' },
|
||||
{ "LatchedRecordEnable", &Configuration::get_latched_record_enable, 't' },
|
||||
{ "VerifyRemoveLastCapture", &Configuration::get_verify_remove_last_capture, 't' },
|
||||
{ "StopRecordingOnXrun", &Configuration::get_stop_recording_on_xrun, 't' },
|
||||
{ "StopTransportAtEndOfSession", &Configuration::get_stop_at_session_end, 't' },
|
||||
{ "UseHardwareMonitoring", &Configuration::get_use_hardware_monitoring, 'r' },
|
||||
{ "UseSoftwareMonitoring", &Configuration::get_use_sw_monitoring, 'r' },
|
||||
{ "UseExternalMonitoring", &Configuration::get_use_external_monitoring, 'r' },
|
||||
{ "MeterFalloffOff", &Configuration::get_meter_falloff_off, 'r' },
|
||||
{ "MeterFalloffSlowest", &Configuration::get_meter_falloff_slowest, 'r' },
|
||||
{ "MeterFalloffSlow", &Configuration::get_meter_falloff_slow, 'r' },
|
||||
{ "MeterFalloffMedium", &Configuration::get_meter_falloff_medium, 'r' },
|
||||
{ "MeterFalloffFast", &Configuration::get_meter_falloff_fast, 'r' },
|
||||
{ "MeterFalloffFaster", &Configuration::get_meter_falloff_faster, 'r' },
|
||||
{ "MeterFalloffFastest", &Configuration::get_meter_falloff_fastest, 'r' },
|
||||
{ "MeterHoldOff", &Configuration::get_meter_hold_off, 'r' },
|
||||
{ "MeterHoldShort", &Configuration::get_meter_hold_short, 'r' },
|
||||
{ "MeterHoldMedium", &Configuration::get_meter_hold_medium, 'r' },
|
||||
{ "MeterHoldLong", &Configuration::get_meter_hold_long, 'r' },
|
||||
{ 0, 0, 0 }
|
||||
};
|
||||
|
||||
for (uint32_t n = 0; options[n].name; ++n) {
|
||||
Glib::RefPtr<Action> act = ActionManager::get_action ("options", options[n].name);
|
||||
if (act) {
|
||||
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
|
||||
tact->set_active ((Config->*(options[n].method))());
|
||||
for (std::vector<Glib::ustring>::iterator i = groups.begin(); i != groups.end(); i++) {
|
||||
Glib::RefPtr<Action> act = ActionManager::get_action (i->c_str(), options[n].name);
|
||||
if (act) {
|
||||
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
|
||||
cerr << "action = " << (options[n].name) << " val = " << (Config->*(options[n].method))() << endl;//DEBUG
|
||||
if (options[n].act_type == 't' || (options[n].act_type == 'r' && (Config->*(options[n].method))()))
|
||||
tact->set_active ((Config->*(options[n].method))());
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -230,12 +254,14 @@ ARDOUR_UI::toggle_editing_space()
|
|||
void
|
||||
ARDOUR_UI::toggle_UseHardwareMonitoring()
|
||||
{
|
||||
Glib::RefPtr<Action> act = ActionManager::get_action ("options", "UseSoftwareMonitoring");
|
||||
Glib::RefPtr<Action> act = ActionManager::get_action ("options", "UseHardwareMonitoring");
|
||||
if (act) {
|
||||
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
|
||||
cerr << "get_active() cond = " << tact->get_active() << endl;//DEBUG
|
||||
if (tact->get_active()) {
|
||||
Config->set_use_hardware_monitoring (true);
|
||||
Config->set_use_sw_monitoring (false);
|
||||
Config->set_use_external_monitoring (false);
|
||||
if (session) {
|
||||
session->reset_input_monitor_state();
|
||||
}
|
||||
|
|
@ -252,6 +278,7 @@ ARDOUR_UI::toggle_UseSoftwareMonitoring()
|
|||
if (tact->get_active()) {
|
||||
Config->set_use_hardware_monitoring (false);
|
||||
Config->set_use_sw_monitoring (true);
|
||||
Config->set_use_external_monitoring (false);
|
||||
if (session) {
|
||||
session->reset_input_monitor_state();
|
||||
}
|
||||
|
|
@ -268,6 +295,7 @@ ARDOUR_UI::toggle_UseExternalMonitoring()
|
|||
if (tact->get_active()) {
|
||||
Config->set_use_hardware_monitoring (false);
|
||||
Config->set_use_sw_monitoring (false);
|
||||
Config->set_use_external_monitoring (true);
|
||||
if (session) {
|
||||
session->reset_input_monitor_state();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ void
|
|||
AudioClock::set_smpte (jack_nframes_t when, bool force)
|
||||
{
|
||||
char buf[32];
|
||||
SMPTE_Time smpte;
|
||||
SMPTE::Time smpte;
|
||||
|
||||
if (is_duration) {
|
||||
session->smpte_duration (when, smpte);
|
||||
|
|
@ -1259,7 +1259,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
return 0;
|
||||
}
|
||||
|
||||
SMPTE_Time smpte;
|
||||
SMPTE::Time smpte;
|
||||
jack_nframes_t sample;
|
||||
|
||||
smpte.hours = atoi (hours_label.get_text());
|
||||
|
|
@ -1280,19 +1280,19 @@ AudioClock::smpte_frame_from_display () const
|
|||
#define SMPTE_SAMPLE_TEST_7
|
||||
|
||||
// Testcode for smpte<->sample conversions (P.S.)
|
||||
SMPTE_Time smpte1;
|
||||
SMPTE::Time smpte1;
|
||||
jack_nframes_t sample1;
|
||||
jack_nframes_t oldsample = 0;
|
||||
SMPTE_Time smpte2;
|
||||
SMPTE::Time smpte2;
|
||||
jack_nframes_t sample_increment;
|
||||
|
||||
sample_increment = (long)rint(session->frame_rate() / session->smpte_frames_per_second);
|
||||
sample_increment = (long)rint(session->frame_rate() / SMPTE::frames_per_second);
|
||||
|
||||
#ifdef SMPTE_SAMPLE_TEST_1
|
||||
// Test 1: use_offset = false, use_subframes = false
|
||||
cout << "use_offset = false, use_subframes = false" << endl;
|
||||
for (int i = 0; i < 108003; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, false /* use_offset */, false /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, false /* use_offset */, false /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, false /* use_offset */, false /* use_subframes */ );
|
||||
|
||||
if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
|
||||
|
|
@ -1313,7 +1313,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_increment( smpte1 );
|
||||
SMPTE::increment( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_increment: " << sample_increment << endl;
|
||||
|
|
@ -1337,7 +1337,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << endl;
|
||||
|
||||
for (int i = 0; i < 108003; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, true /* use_offset */, false /* use_subframes */ );
|
||||
|
||||
// cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << " -> ";
|
||||
|
|
@ -1363,7 +1363,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_increment( smpte1 );
|
||||
SMPTE::increment( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_increment: " << sample_increment << endl;
|
||||
|
|
@ -1380,7 +1380,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << endl;
|
||||
|
||||
for (int i = 0; i < 108003; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, true /* use_offset */, false /* use_subframes */ );
|
||||
|
||||
// cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << " -> ";
|
||||
|
|
@ -1406,7 +1406,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_decrement( smpte1 );
|
||||
SMPTE::decrement( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_decrement: " << sample_increment << endl;
|
||||
|
|
@ -1433,7 +1433,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << endl;
|
||||
|
||||
for (int i = 0; i < 108003; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, true /* use_offset */, true /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, true /* use_offset */, true /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, true /* use_offset */, true /* use_subframes */ );
|
||||
|
||||
if ((i > 0) && ( ((sample1 - oldsample) != sample_increment) && ((sample1 - oldsample) != (sample_increment + 1)) && ((sample1 - oldsample) != (sample_increment - 1)))) {
|
||||
|
|
@ -1454,7 +1454,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_increment( smpte1 );
|
||||
SMPTE::increment( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_increment: " << sample_increment << endl;
|
||||
|
|
@ -1462,7 +1462,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
cout << "smpte: " << (smpte2.negative ? "-" : "") << smpte2.hours << ":" << smpte2.minutes << ":" << smpte2.seconds << ":" << smpte2.frames << "::" << smpte2.subframes << endl;
|
||||
|
||||
for (int i = 0; i < 108003; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, true /* use_offset */, true /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, true /* use_offset */, true /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, true /* use_offset */, true /* use_subframes */ );
|
||||
|
||||
if ((i > 0) && ( ((oldsample - sample1) != sample_increment) && ((oldsample - sample1) != (sample_increment + 1)) && ((oldsample - sample1) != (sample_increment - 1)))) {
|
||||
|
|
@ -1483,7 +1483,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_decrement( smpte1 );
|
||||
SMPTE::decrement( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_decrement: " << sample_increment << endl;
|
||||
|
|
@ -1510,7 +1510,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << endl;
|
||||
|
||||
for (int i = 0; i < 3600; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, true /* use_offset */, false /* use_subframes */ );
|
||||
|
||||
// cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << " -> ";
|
||||
|
|
@ -1533,7 +1533,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_increment_seconds( smpte1 );
|
||||
SMPTE::increment_seconds( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_increment: " << sample_increment << endl;
|
||||
|
|
@ -1559,7 +1559,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << endl;
|
||||
|
||||
for (int i = 0; i < 60; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, true /* use_offset */, false /* use_subframes */ );
|
||||
|
||||
// cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << " -> ";
|
||||
|
|
@ -1582,7 +1582,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_increment_minutes( smpte1 );
|
||||
SMPTE::increment_minutes( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_increment: " << sample_increment << endl;
|
||||
|
|
@ -1607,7 +1607,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << endl;
|
||||
|
||||
for (int i = 0; i < 10; i++) {
|
||||
session->smpte_to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
SMPTE::to_sample( smpte1, sample1, true /* use_offset */, false /* use_subframes */ );
|
||||
session->sample_to_smpte( sample1, smpte2, true /* use_offset */, false /* use_subframes */ );
|
||||
|
||||
// cout << "smpte: " << (smpte1.negative ? "-" : "") << smpte1.hours << ":" << smpte1.minutes << ":" << smpte1.seconds << ":" << smpte1.frames << "::" << smpte1.subframes << " -> ";
|
||||
|
|
@ -1630,7 +1630,7 @@ AudioClock::smpte_frame_from_display () const
|
|||
break;
|
||||
}
|
||||
oldsample = sample1;
|
||||
session->smpte_increment_hours( smpte1 );
|
||||
SMPTE::increment_hours( smpte1 );
|
||||
}
|
||||
|
||||
cout << "sample_increment: " << sample_increment << endl;
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ class Editor : public PublicEditor
|
|||
void toggle_waveforms_while_recording ();
|
||||
void toggle_measure_visibility ();
|
||||
|
||||
void set_meter_falloff (float);
|
||||
void set_meter_falloff (int);
|
||||
void set_meter_hold (int32_t);
|
||||
|
||||
/* xfades */
|
||||
|
|
|
|||
|
|
@ -371,13 +371,13 @@ Editor::register_actions ()
|
|||
Slow = 6.8dB/sec falloff at update rate of 40ms
|
||||
*/
|
||||
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffOff"), _("Off"), bind (mem_fun (*this, &Editor::set_meter_falloff), 0.0f));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffSlowest"), _("Slowest"), bind (mem_fun (*this, &Editor::set_meter_falloff), 0.266f));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffSlow"), _("Slow"), bind (mem_fun (*this, &Editor::set_meter_falloff), 0.342f));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffMedium"), _("Medium"), bind (mem_fun (*this, &Editor::set_meter_falloff), 0.7f));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffFast"), _("Fast"), bind (mem_fun (*this, &Editor::set_meter_falloff), 1.1f));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffFaster"), _("Faster"), bind (mem_fun (*this, &Editor::set_meter_falloff), 1.5f));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffFastest"), _("Fastest"), bind (mem_fun (*this, &Editor::set_meter_falloff), 2.5f));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffOff"), _("Off"), bind (mem_fun (*this, &Editor::set_meter_falloff), 0));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffSlowest"), _("Slowest"), bind (mem_fun (*this, &Editor::set_meter_falloff), 1));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffSlow"), _("Slow"), bind (mem_fun (*this, &Editor::set_meter_falloff), 2));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffMedium"), _("Medium"), bind (mem_fun (*this, &Editor::set_meter_falloff), 3));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffFast"), _("Fast"), bind (mem_fun (*this, &Editor::set_meter_falloff), 4));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffFaster"), _("Faster"), bind (mem_fun (*this, &Editor::set_meter_falloff), 5));
|
||||
ActionManager::register_radio_action (editor_actions, meter_falloff_group, X_("MeterFalloffFastest"), _("Fastest"), bind (mem_fun (*this, &Editor::set_meter_falloff), 6));
|
||||
|
||||
ActionManager::register_radio_action (editor_actions, meter_hold_group, X_("MeterHoldOff"), _("Off"), bind (mem_fun (*this, &Editor::set_meter_hold), 0));
|
||||
ActionManager::register_radio_action (editor_actions, meter_hold_group, X_("MeterHoldShort"), _("Short"), bind (mem_fun (*this, &Editor::set_meter_hold), 40));
|
||||
|
|
|
|||
|
|
@ -3417,7 +3417,7 @@ void
|
|||
Editor::show_verbose_time_cursor (jack_nframes_t frame, double offset, double xpos, double ypos)
|
||||
{
|
||||
char buf[128];
|
||||
SMPTE_Time smpte;
|
||||
SMPTE::Time smpte;
|
||||
BBT_Time bbt;
|
||||
float secs;
|
||||
|
||||
|
|
@ -3461,7 +3461,7 @@ void
|
|||
Editor::show_verbose_duration_cursor (jack_nframes_t start, jack_nframes_t end, double offset, double xpos, double ypos)
|
||||
{
|
||||
char buf[128];
|
||||
SMPTE_Time smpte;
|
||||
SMPTE::Time smpte;
|
||||
BBT_Time sbbt;
|
||||
BBT_Time ebbt;
|
||||
float secs;
|
||||
|
|
|
|||
|
|
@ -93,14 +93,78 @@ Editor::redo (uint32_t n)
|
|||
void
|
||||
Editor::set_meter_hold (int32_t cnt)
|
||||
{
|
||||
Config->set_meter_hold_off(false);
|
||||
Config->set_meter_hold_short(false);
|
||||
Config->set_meter_hold_medium(false);
|
||||
Config->set_meter_hold_long(false);
|
||||
|
||||
switch (cnt)
|
||||
{
|
||||
case 0:
|
||||
Config->set_meter_hold_off(true);
|
||||
break;
|
||||
case 40:
|
||||
Config->set_meter_hold_short(true);
|
||||
break;
|
||||
case 100:
|
||||
Config->set_meter_hold_medium(true);
|
||||
break;
|
||||
case 200:
|
||||
Config->set_meter_hold_long(true);
|
||||
break;
|
||||
}
|
||||
|
||||
if (session) {
|
||||
session->set_meter_hold (cnt);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
Editor::set_meter_falloff (float val)
|
||||
Editor::set_meter_falloff (int intval)
|
||||
{
|
||||
float val;
|
||||
std::string str;
|
||||
cerr << "set_meter_falloff () called: intval = " << intval << endl;
|
||||
Config->set_meter_falloff_off(false);
|
||||
Config->set_meter_falloff_slowest(false);
|
||||
Config->set_meter_falloff_slow(false);
|
||||
Config->set_meter_falloff_medium(false);
|
||||
Config->set_meter_falloff_fast(false);
|
||||
Config->set_meter_falloff_faster(false);
|
||||
Config->set_meter_falloff_fastest(false);
|
||||
|
||||
switch (intval)
|
||||
{
|
||||
case 0:
|
||||
val = 0.0f;
|
||||
Config->set_meter_falloff_off(true);
|
||||
break;
|
||||
case 1:
|
||||
val = 0.266f;
|
||||
Config->set_meter_falloff_slowest(true);
|
||||
break;
|
||||
case 2:
|
||||
val = 0.342f;
|
||||
Config->set_meter_falloff_slow(true);
|
||||
break;
|
||||
case 3:
|
||||
val = 0.7f;
|
||||
Config->set_meter_falloff_medium(true);
|
||||
break;
|
||||
case 4:
|
||||
val = 1.1f;
|
||||
Config->set_meter_falloff_fast(true);
|
||||
break;
|
||||
case 5:
|
||||
val = 1.5f;
|
||||
Config->set_meter_falloff_faster(true);
|
||||
break;
|
||||
case 6:
|
||||
val = 2.5f;
|
||||
Config->set_meter_falloff_fastest(true);
|
||||
break;
|
||||
}
|
||||
|
||||
if (session) {
|
||||
session->set_meter_falloff (val);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include <string>
|
||||
|
||||
#include <ardour/tempo.h>
|
||||
#include <ardour/smpte.h>
|
||||
#include <gtkmm2ext/gtk_ui.h>
|
||||
|
||||
#include "editor.h"
|
||||
|
|
@ -798,7 +799,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp
|
|||
jack_nframes_t pos;
|
||||
jack_nframes_t spacer;
|
||||
jack_nframes_t fr;
|
||||
SMPTE_Time smpte;
|
||||
SMPTE::Time smpte;
|
||||
gchar buf[16];
|
||||
gint nmarks = 0;
|
||||
gint n;
|
||||
|
|
@ -927,13 +928,13 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp
|
|||
(*marks)[n].position = pos;
|
||||
|
||||
// Increment subframes by one
|
||||
session->smpte_increment_subframes( smpte );
|
||||
SMPTE::increment_subframes( smpte );
|
||||
}
|
||||
} else if (show_seconds) {
|
||||
// Find smpte time of this sample (pos)
|
||||
session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
|
||||
// Go to next whole second down
|
||||
session->smpte_seconds_floor( smpte );
|
||||
SMPTE::seconds_floor( smpte );
|
||||
|
||||
for (n = 0; n < nmarks; n++) {
|
||||
session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
|
||||
|
|
@ -953,13 +954,13 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp
|
|||
|
||||
}
|
||||
(*marks)[n].label = g_strdup (buf);
|
||||
session->smpte_increment_seconds( smpte );
|
||||
SMPTE::increment_seconds( smpte );
|
||||
}
|
||||
} else if (show_minutes) {
|
||||
// Find smpte time of this sample (pos)
|
||||
session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
|
||||
// Go to next whole minute down
|
||||
session->smpte_minutes_floor( smpte );
|
||||
SMPTE::minutes_floor( smpte );
|
||||
|
||||
for (n = 0; n < nmarks; n++) {
|
||||
session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
|
||||
|
|
@ -977,13 +978,13 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp
|
|||
}
|
||||
(*marks)[n].label = g_strdup (buf);
|
||||
(*marks)[n].position = pos;
|
||||
session->smpte_increment_minutes( smpte );
|
||||
SMPTE::increment_minutes( smpte );
|
||||
}
|
||||
} else if (show_hours) {
|
||||
// Find smpte time of this sample (pos)
|
||||
session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
|
||||
// Go to next whole hour down
|
||||
session->smpte_hours_floor( smpte );
|
||||
SMPTE::hours_floor( smpte );
|
||||
|
||||
for (n = 0; n < nmarks; n++) {
|
||||
session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
|
||||
|
|
@ -998,13 +999,13 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp
|
|||
(*marks)[n].label = g_strdup (buf);
|
||||
(*marks)[n].position = pos;
|
||||
|
||||
session->smpte_increment_hours( smpte );
|
||||
SMPTE::increment_hours( smpte );
|
||||
}
|
||||
} else { // show_frames
|
||||
// Find smpte time of this sample (pos)
|
||||
session->sample_to_smpte(pos, smpte, true /* use_offset */, false /* use_subframes */ );
|
||||
// Go to next whole frame down
|
||||
session->smpte_frames_floor( smpte );
|
||||
SMPTE::frames_floor( smpte );
|
||||
|
||||
for (n = 0; n < nmarks; n++) {
|
||||
session->smpte_to_sample(smpte, pos, true /* use_offset */, false /* use_subframes */ );
|
||||
|
|
@ -1019,7 +1020,7 @@ Editor::metric_get_smpte (GtkCustomRulerMark **marks, gdouble lower, gdouble upp
|
|||
|
||||
}
|
||||
(*marks)[n].label = g_strdup (buf);
|
||||
session->smpte_increment( smpte );
|
||||
SMPTE::increment( smpte );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -251,8 +251,10 @@ which_ui_rcfile ()
|
|||
|
||||
if (rcfile.empty()) {
|
||||
warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR2_UI_RC to point to a valid UI style file") << endmsg;
|
||||
} else {
|
||||
cerr << "Loading ui configuration file " << rcfile << endl;
|
||||
}
|
||||
|
||||
|
||||
return rcfile;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -414,14 +414,14 @@ MixerStrip::set_width (Width w)
|
|||
set_size_request (-1, -1);
|
||||
xml_node->add_property ("strip_width", "wide");
|
||||
|
||||
rec_enable_button->set_label (_("Record"));
|
||||
mute_button->set_label (_("Mute"));
|
||||
solo_button->set_label (_("Solo"));
|
||||
rec_enable_button->set_label (_("record"));
|
||||
mute_button->set_label (_("mute"));
|
||||
solo_button->set_label (_("solo"));
|
||||
|
||||
if (_route.comment() == "") {
|
||||
comment_button.set_label (_("Comments"));
|
||||
comment_button.set_label (_("comments"));
|
||||
} else {
|
||||
comment_button.set_label (_("*Comments*"));
|
||||
comment_button.set_label (_("*comments*"));
|
||||
}
|
||||
|
||||
gpm.gain_automation_style_button.set_label (gpm.astyle_string(_route.gain_automation_curve().automation_style()));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue