ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-04-28 18:02:38 +02:00
commit 28eb2018a5
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/note_base.cc
View File

@ -293,6 +293,14 @@ NoteBase::event_handler (GdkEvent* ev)
return false;
}
if (_region.get_time_axis_view ().layer_display () == Stacked) {
/* only allow edting notes in the topmost layer */
if (_region.region()->layer() != _region.region()->playlist()->top_layer ()) {
/* this stll allows the draw tool to work, and edit cursor is updated */
return false;
}
}
switch (ev->type) {
case GDK_ENTER_NOTIFY:
_region.note_entered (this);

3
libs/ardour/session.cc
View File

@ -1461,7 +1461,7 @@ Session::vapor_barrier ()
{
#if !(defined (LV2_EXTENDED) && defined (HAVE_LV2_1_10_0))
return false;
#endif
#else
if (_vapor_available.has_value ()) {
return _vapor_available.value ();
}
@ -1494,6 +1494,7 @@ Session::vapor_barrier ()
_vapor_available = ok;
return ok;
#endif
}
bool

6
libs/ardour/surround_return.cc
View File

@ -750,9 +750,9 @@ SurroundReturn::maybe_send_metadata (size_t id, pframes_t sample, pan_t const v[
if (!changed && !force) {
return;
}
#if defined(LV2_EXTENDED) && defined(HAVE_LV2_1_10_0)
URIMap::URIDs const& urids = URIMap::instance ().urids;
#if defined(LV2_EXTENDED) && defined(HAVE_LV2_1_10_0)
LV2_Atom_Forge_Frame frame;
lv2_atom_forge_set_buffer (&_forge, _atom_buf, sizeof (_atom_buf));
lv2_atom_forge_frame_time (&_forge, 0);
@ -829,6 +829,7 @@ SurroundReturn::set_playback_offset (samplecnt_t cnt)
void
SurroundReturn::setup_export (std::string const& fn, samplepos_t ss, samplepos_t es)
{
#if defined(LV2_EXTENDED) && defined(HAVE_LV2_1_10_0)
URIMap::URIDs const& urids = URIMap::instance ().urids;
bool have_ref = !_export_reference.empty () && Glib::file_test (_export_reference, Glib::FileTest (Glib::FILE_TEST_EXISTS | Glib::FILE_TEST_IS_REGULAR));
@ -875,13 +876,16 @@ SurroundReturn::setup_export (std::string const& fn, samplepos_t ss, samplepos_t
_export_start = ss - effective_latency ();
_export_end = es - effective_latency ();
}
#endif
}
void
SurroundReturn::finalize_export ()
{
#if defined(LV2_EXTENDED) && defined(HAVE_LV2_1_10_0)
//std::cout << "SurroundReturn::finalize_export\n";
_surround_processor->finalize_export ();
#endif
_exporting = false;
_export_start = _export_end = 0;
}