ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-05-31 15:50:40 +02:00
commit 7269c1f91f
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Doxyfile
View File

@ -1337,7 +1337,7 @@ HTML_COLORSTYLE_GAMMA = 113
# The default value is: NO. # The default value is: NO.
# This tag requires that the tag GENERATE_HTML is set to YES. # This tag requires that the tag GENERATE_HTML is set to YES.
HTML_TIMESTAMP = NO HTML_TIMESTAMP = YES
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML # If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
# documentation will contain a main index with vertical navigation menus that # documentation will contain a main index with vertical navigation menus that

8
doc/mainpage.md
View File

@ -54,7 +54,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
Handling Standard %MIDI File (Evoral::SMF) format. Abstracted to C++ in SMF.{cc,h} Handling Standard %MIDI File (Evoral::SMF) format. Abstracted to C++ in SMF.{cc,h}
* libs/backends/ * `libs/backends/`
Interaction with Operating System's Audio/MIDI API: Interaction with Operating System's Audio/MIDI API:
ALSA, CoreAudio, JACK, PortAudio/ASIO, PulseAudio ALSA, CoreAudio, JACK, PortAudio/ASIO, PulseAudio
@ -72,7 +72,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
%MIDI parsing, MIDNAM handling, Port abstraction for I/O %MIDI parsing, MIDNAM handling, Port abstraction for I/O
* `libs/temporal` * `libs/temporal/`
Various utility code for dealing with different kinds of time, Various utility code for dealing with different kinds of time,
including Timecode, and musical time conversions (Temporal::Beats, Temporal::BBT_Time). including Timecode, and musical time conversions (Temporal::Beats, Temporal::BBT_Time).
@ -103,7 +103,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
### UI related libs ### UI related libs
* libs/gtkmm2ext/ * `libs/gtkmm2ext/`
Utility Library to extend GDK, GTK, and basic abstraction for UIs Utility Library to extend GDK, GTK, and basic abstraction for UIs
and event-loops. This library is not limited to the GUI, but also and event-loops. This library is not limited to the GUI, but also
@ -125,7 +125,7 @@ A few specific libraries are compiled statically (e.g. fluidsynth for use in plu
Threaded waveform rendering and waveform image cache. Threaded waveform rendering and waveform image cache.
* libs/tk/ * `libs/tk/`
A localized version of GTK+2, renamed as YTK. See Gtk namespace for relevant documentation. A localized version of GTK+2, renamed as YTK. See Gtk namespace for relevant documentation.

1
gtk2_ardour/editor.cc
View File

@ -7256,6 +7256,7 @@ Editor::start_track_drag (TimeAxisView& tav, int y, Gtk::Widget& w)
{ {
track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav), *_session); track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav), *_session);
DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag)); DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag));
PBD::stacktrace (std::cerr, 20);
track_drag->drag_cursor = _cursors->move->gobj(); track_drag->drag_cursor = _cursors->move->gobj();
track_drag->predrag_cursor = gdk_window_get_cursor (edit_controls_vbox.get_window()->gobj()); track_drag->predrag_cursor = gdk_window_get_cursor (edit_controls_vbox.get_window()->gobj());

2
tools/osx_packaging/osx_build
View File

@ -635,7 +635,7 @@ mkdir $PRODUCT_PKG_DIR
DMGWINBOTTOM=440 DMGWINBOTTOM=440
DMGBACKGROUND=dmgbg DMGBACKGROUND=dmgbg
if [ x$MIXBUS != x ] ; then if [ x$MIXBUS != x -o x$LIVETRAX != x] ; then
# Mixbus packaging # Mixbus packaging