ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-07-20 14:47:18 +02:00
commit 5b64fd6913
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
6 changed files with 1672 additions and 1432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk2_ardour/editor_ops.cc
View File

@ -2820,7 +2820,22 @@ Editor::cut_copy_section (ARDOUR::SectionOperation const op)
if (!get_selection_extents (start, end) || !_session) {
return;
}
#if 1
TempoMap::SharedPtr tmap (TempoMap::use());
if ((tmap->tempos ().size () > 1 || tmap->meters ().size () > 1 || tmap->bartimes ().size () > 1) && UIConfiguration::instance().get_ask_cut_copy_section_tempo_map ()) {
ArdourMessageDialog msg (_("Cut/Copy Section does not yet correctly include tempo/meter changes\nDo you still want to proceed?"), false, MESSAGE_QUESTION, BUTTONS_YES_NO, true) ;
msg.set_title (_("Cut/Copy Tempo Map"));
Gtk::CheckButton cb (_("Do not show this dialog again."));
msg.get_vbox()->pack_start (cb);
cb.show ();
if (msg.run () != RESPONSE_YES) {
return;
}
if (cb.get_active ()) {
UIConfiguration::instance().set_ask_cut_copy_section_tempo_map (false);
}
}
#endif
timepos_t to = Profile->get_mixbus () ? timepos_t (_session->audible_sample ()) : get_preferred_edit_position ();
_session->cut_copy_section (start, end, to, op);

1877
gtk2_ardour/po/ru.po
View File

File diff suppressed because it is too large Load Diff

6
gtk2_ardour/port_group.cc
View File

@ -533,16 +533,20 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
if ((type == DataType::MIDI || type == DataType::NIL)) {
ControlProtocolManager& m = ControlProtocolManager::instance ();
std::shared_ptr<Bundle> sf (new Bundle (_("Control Surface"), inputs));
for (list<ControlProtocolInfo*>::iterator i = m.control_protocol_info.begin(); i != m.control_protocol_info.end(); ++i) {
if ((*i)->protocol) {
list<std::shared_ptr<Bundle> > b = (*i)->protocol->bundles ();
for (list<std::shared_ptr<Bundle> >::iterator j = b.begin(); j != b.end(); ++j) {
if ((*j)->ports_are_inputs() == inputs) {
program->add_bundle (*j);
sf->add_channels_from_bundle (*j);
}
}
}
}
if (sf->n_total () > 0) {
program->add_bundle (sf);
}
}
/* virtual keyboard */

1198
libs/ardour/po/ru.po
View File

File diff suppressed because it is too large Load Diff

4
libs/tk/ydk/quartz/gdkwindow-quartz.c
View File

@ -2365,6 +2365,10 @@ gdk_window_set_type_hint (GdkWindow *window,
[impl->toplevel setHasShadow: window_type_hint_to_shadow (hint)];
[impl->toplevel setLevel: window_type_hint_to_level (hint)];
[impl->toplevel setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (hint)];
bool allow_minimize_and_maximize = window_type_hint_to_level (hint) != NSFloatingWindowLevel;
[[impl->toplevel standardWindowButton:NSWindowMiniaturizeButton] setEnabled:allow_minimize_and_maximize];
[[impl->toplevel standardWindowButton:NSWindowZoomButton] setEnabled:allow_minimize_and_maximize];
}
GdkWindowTypeHint

2
share/scripts/trigger_mixer_scene.lua
View File

@ -27,7 +27,7 @@ function factory ()
return
end
local mloc = loc:first_mark_at(mpos, Temporal.timecnt_t(0))
local mloc = loc:mark_at(mpos, Temporal.timecnt_t(0), 0)
if not mloc then
-- no marker found at that location
return