ardour/livetrax
13
0
Fork 0
Code
6c15404574
livetrax/gtk2_ardour/editor.cc

6353 lines
186 KiB
C++
Raw Normal View History

Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
/*
Update GPL boilerplate and (C) Copyright-holder and year information is extracted from git log. git history begins in 2005. So (C) from 1998..2005 is lost. Also some (C) assignment of commits where the committer didn't use --author.
2019-08-02 17:26:43 -04:00
* Copyright (C) 2005-2007 Doug McLain <doug@nostar.net>
* Copyright (C) 2005-2009 Taybin Rutkin <taybin@taybin.com>
* Copyright (C) 2005-2019 Paul Davis <paul@linuxaudiosystems.com>
* Copyright (C) 2005 Karsten Wiese <fzuuzf@googlemail.com>
* Copyright (C) 2006-2009 Sampo Savolainen <v2@iki.fi>
* Copyright (C) 2006-2015 David Robillard <d@drobilla.net>
* Copyright (C) 2006-2017 Tim Mayberry <mojofunk@gmail.com>
* Copyright (C) 2007-2012 Carl Hetherington <carl@carlh.net>
* Copyright (C) 2008 Hans Baier <hansfbaier@googlemail.com>
* Copyright (C) 2012-2019 Robin Gareus <robin@gareus.org>
* Copyright (C) 2013-2015 Colin Fletcher <colin.m.fletcher@googlemail.com>
* Copyright (C) 2014-2017 Nick Mainsbridge <mainsbridge@gmail.com>
* Copyright (C) 2014-2019 Ben Loftis <ben@harrisonconsoles.com>
* Copyright (C) 2015 André Nusser <andre.nusser@googlemail.com>
*
* 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.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Add some comments. git-svn-id: svn://localhost/ardour2/trunk@1837 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-11 11:06:12 -04:00
/* Note: public Editor methods are documented in public_editor.h */
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
#include <stdint.h>
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
#include <unistd.h>
#include <cstdlib>
#include <cmath>
#include <string>
#include <algorithm>
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
#include <map>
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merged revisions 6293,6296-6306,6308 via svnmerge from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes ........ r6293 | trutkin | 2009-12-05 08:49:37 -0500 (Sat, 05 Dec 2009) | 2 lines fix if-statement in build script ........ r6296 | trutkin | 2009-12-05 09:30:19 -0500 (Sat, 05 Dec 2009) | 5 lines rearrange GTKOSX and darwin dependencies - moved some GTKOSX include paths to generic darwin - made GTKOSX dependent on being on darwin anyways ........ r6297 | trutkin | 2009-12-05 09:35:09 -0500 (Sat, 05 Dec 2009) | 2 lines move coreaudio and audiounit handling to darwin section ........ r6298 | trutkin | 2009-12-05 09:53:40 -0500 (Sat, 05 Dec 2009) | 3 lines use True/False instead of 1/0 fix another if-statement where it should be an elif-statement ........ r6299 | trutkin | 2009-12-05 14:11:09 -0500 (Sat, 05 Dec 2009) | 10 lines fixes to get libardour building - can't cast away volatile, so copy _transport_frame before emitting it. - const_reverse_iterator::operator!=() isn't defined in this version of gcc. - removed annoying HERE WE ARE CAAudioFile.h #warning. - removed unnecessary include of sndfile.h in session.h. - we don't want to set -march=i686 on the mac, so indent this if-statement so it's only run on linux. - DEBUG_STR() fails in the NDEBUG case, so wrap its use in an #ifndef NDEBUG ........ r6300 | trutkin | 2009-12-05 15:48:29 -0500 (Sat, 05 Dec 2009) | 2 lines remove old scons-style CXXFLAGS_FOO in favor of just CXXFLAGS ........ r6301 | trutkin | 2009-12-05 16:01:10 -0500 (Sat, 05 Dec 2009) | 8 lines clean up configure flags - removed useless --aubio and --syslibs flags. The syslibs value is ignored as we don't bring our own libraries with us anymoreand we use aubio automatically if it's available - added ways to turn off fpu_optimization and NLS - fixed compiling on the mac without fpu_optimization ........ r6302 | trutkin | 2009-12-05 18:12:46 -0500 (Sat, 05 Dec 2009) | 5 lines go back to prior uselib method for COREAUDIO, AUDIOUNIT, and GTKOSX - fixed compile of CoreAudioSource - re-did inclusion of coremidi_midiport.cc to depend on COREAUDIO presence ........ r6303 | trutkin | 2009-12-05 18:59:02 -0500 (Sat, 05 Dec 2009) | 5 lines fixed compiler warnings about classes with virtual member functions, but no virtual destructor. - Changed Metering to not use foo() = 0; to indicate it shouldn't be instantiated, but private: Metering(), which is more idiomatic. ........ r6304 | trutkin | 2009-12-05 19:25:41 -0500 (Sat, 05 Dec 2009) | 2 lines TOP_MENUBAR isn't used when building ardour.menus. Removed. ........ r6305 | trutkin | 2009-12-05 19:46:11 -0500 (Sat, 05 Dec 2009) | 5 lines fix some AudioUnit compile errors - update AudioUnit to use ChanCount - fix some namespacing issues in audio_unit.h ........ r6306 | trutkin | 2009-12-05 20:08:48 -0500 (Sat, 05 Dec 2009) | 2 lines make --extra-warn useful ........ r6308 | trutkin | 2009-12-05 22:59:42 -0500 (Sat, 05 Dec 2009) | 10 lines fix compiling/linking with --coreaudio - rearrange ardour_ui.h header in editor.cc to avoid conflict - midi++ depends on OSX as well as COREAUDIO - fixed including frameworks - tweaked --extra-warn again. it's kinda redundent with --strict - improved indentation in wscript - use #ifdef HAVE_COREMIDI, not #if HAVE_COREMIDI. #if isn't interchangable with #ifdef and won't work if HAVE_COREMIDI is defined with no value. ........ git-svn-id: svn://localhost/ardour2/branches/3.0@6310 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-05 23:35:48 -05:00
#include "ardour_ui.h"
/*
* ardour_ui.h include was moved to the top of the list
* due to a conflicting definition of 'Style' between
* Apple's MacTypes.h and BarController.
*/
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
#include <boost/none.hpp>
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
#include <sigc++/bind.h>
*** NEW CODING POLICY *** All #include statements that include a header that is a part of a library bundled with ardour MUST use quotes, not angle brackets. Do this: #include "ardour/types.h" NOT this: #include <ardour/types.h> Rationale: This is best practice in general, to ensure we include the local version and not the system version. That quotes mean "local" (in some sense) and angle brackets mean "system" (in some sense) is a ubiquitous convention and IIRC right in the C spec somewhere. More pragmatically, this is required by (my) waf (stuff) for dependencies to work correctly. That is: !!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!! Failure to comply is punishable by death by torture. :) P.S. It's not that dramatic in all cases, but this (in combination with some GCC flags specific to the include type) is the best way I have found to be absolutely 100% positive the local ones are being used (and we definitely want to be absolutely 100% positive on that one). git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 13:26:51 -05:00
#include "pbd/convert.h"
#include "pbd/error.h"
#include "pbd/enumwriter.h"
#include "pbd/memento_command.h"
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
#include "pbd/unknown_type.h"
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
#include "pbd/unwind.h"
fix restore of snap mode (confusion caused by existence of internal/preinternal snap modes) git-svn-id: svn://localhost/ardour2/branches/3.0@13878 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-18 10:56:41 -05:00
#include "pbd/stacktrace.h"
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
#include "pbd/timersub.h"
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merged with trunk R1622. git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 03:07:38 -04:00
#include <glibmm/miscutils.h>
use Glib URI utility function to generate a local filename from a URI, rather than hand-crafted code
2014-01-17 09:24:18 -05:00
#include <glibmm/uriutils.h>
compiles and runs, but crashes ... duh git-svn-id: svn://localhost/trunk/ardour2@113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-25 19:06:46 -05:00
#include <gtkmm/image.h>
#include <gdkmm/color.h>
#include <gdkmm/bitmap.h>
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
#include <gtkmm/menu.h>
#include <gtkmm/menuitem.h>
basic adoption of new mouse binding facility git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 22:10:48 -05:00
#include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/gtk_ui.h"
Remove unused sources & includes
2017-07-16 18:00:11 -04:00
#include "gtkmm2ext/keyboard.h"
basic adoption of new mouse binding facility git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 22:10:48 -05:00
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/window_title.h"
#include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
add region & range loudnless report
2016-03-11 11:26:27 -05:00
#include "ardour/analysis_graph.h"
*** NEW CODING POLICY *** All #include statements that include a header that is a part of a library bundled with ardour MUST use quotes, not angle brackets. Do this: #include "ardour/types.h" NOT this: #include <ardour/types.h> Rationale: This is best practice in general, to ensure we include the local version and not the system version. That quotes mean "local" (in some sense) and angle brackets mean "system" (in some sense) is a ubiquitous convention and IIRC right in the C spec somewhere. More pragmatically, this is required by (my) waf (stuff) for dependencies to work correctly. That is: !!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!! Failure to comply is punishable by death by torture. :) P.S. It's not that dramatic in all cases, but this (in combination with some GCC flags specific to the include type) is the best way I have found to be absolutely 100% positive the local ones are being used (and we definitely want to be absolutely 100% positive on that one). git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 13:26:51 -05:00
#include "ardour/audio_track.h"
Remove over 500 unnecessary includes (including 54 of session.h). It's slightly possible that this causes trivial build failures on different configurations, but otherwise shouldn't cause any problems (i.e. no actual changes other than include/naming/namespace stuff). I deliberately avoided removing libardour-config.h since this can mysteriously break things, though a few of those do seem to be unnecessary. This commit only targets includes of ardour/*.h. There is also a very large number of unnecessary includes of stuff in gtk2_ardour; tackling that should also give a big improvement in build time when things are modified. git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:09:29 -04:00
#include "ardour/audioengine.h"
*** NEW CODING POLICY *** All #include statements that include a header that is a part of a library bundled with ardour MUST use quotes, not angle brackets. Do this: #include "ardour/types.h" NOT this: #include <ardour/types.h> Rationale: This is best practice in general, to ensure we include the local version and not the system version. That quotes mean "local" (in some sense) and angle brackets mean "system" (in some sense) is a ubiquitous convention and IIRC right in the C spec somewhere. More pragmatically, this is required by (my) waf (stuff) for dependencies to work correctly. That is: !!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!! Failure to comply is punishable by death by torture. :) P.S. It's not that dramatic in all cases, but this (in combination with some GCC flags specific to the include type) is the best way I have found to be absolutely 100% positive the local ones are being used (and we definitely want to be absolutely 100% positive on that one). git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 13:26:51 -05:00
#include "ardour/audioregion.h"
fix OSX/PPC 10.4 long maths
2015-03-31 10:05:15 -04:00
#include "ardour/lmath.h"
*** NEW CODING POLICY *** All #include statements that include a header that is a part of a library bundled with ardour MUST use quotes, not angle brackets. Do this: #include "ardour/types.h" NOT this: #include <ardour/types.h> Rationale: This is best practice in general, to ensure we include the local version and not the system version. That quotes mean "local" (in some sense) and angle brackets mean "system" (in some sense) is a ubiquitous convention and IIRC right in the C spec somewhere. More pragmatically, this is required by (my) waf (stuff) for dependencies to work correctly. That is: !!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!! Failure to comply is punishable by death by torture. :) P.S. It's not that dramatic in all cases, but this (in combination with some GCC flags specific to the include type) is the best way I have found to be absolutely 100% positive the local ones are being used (and we definitely want to be absolutely 100% positive on that one). git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 13:26:51 -05:00
#include "ardour/location.h"
#include "ardour/profile.h"
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
#include "ardour/route.h"
*** NEW CODING POLICY *** All #include statements that include a header that is a part of a library bundled with ardour MUST use quotes, not angle brackets. Do this: #include "ardour/types.h" NOT this: #include <ardour/types.h> Rationale: This is best practice in general, to ensure we include the local version and not the system version. That quotes mean "local" (in some sense) and angle brackets mean "system" (in some sense) is a ubiquitous convention and IIRC right in the C spec somewhere. More pragmatically, this is required by (my) waf (stuff) for dependencies to work correctly. That is: !!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!! Failure to comply is punishable by death by torture. :) P.S. It's not that dramatic in all cases, but this (in combination with some GCC flags specific to the include type) is the best way I have found to be absolutely 100% positive the local ones are being used (and we definitely want to be absolutely 100% positive on that one). git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 13:26:51 -05:00
#include "ardour/route_group.h"
Remove over 500 unnecessary includes (including 54 of session.h). It's slightly possible that this causes trivial build failures on different configurations, but otherwise shouldn't cause any problems (i.e. no actual changes other than include/naming/namespace stuff). I deliberately avoided removing libardour-config.h since this can mysteriously break things, though a few of those do seem to be unnecessary. This commit only targets includes of ardour/*.h. There is also a very large number of unnecessary includes of stuff in gtk2_ardour; tackling that should also give a big improvement in build time when things are modified. git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 02:09:29 -04:00
#include "ardour/session_playlists.h"
*** NEW CODING POLICY *** All #include statements that include a header that is a part of a library bundled with ardour MUST use quotes, not angle brackets. Do this: #include "ardour/types.h" NOT this: #include <ardour/types.h> Rationale: This is best practice in general, to ensure we include the local version and not the system version. That quotes mean "local" (in some sense) and angle brackets mean "system" (in some sense) is a ubiquitous convention and IIRC right in the C spec somewhere. More pragmatically, this is required by (my) waf (stuff) for dependencies to work correctly. That is: !!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!! Failure to comply is punishable by death by torture. :) P.S. It's not that dramatic in all cases, but this (in combination with some GCC flags specific to the include type) is the best way I have found to be absolutely 100% positive the local ones are being used (and we definitely want to be absolutely 100% positive on that one). git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 13:26:51 -05:00
#include "ardour/tempo.h"
#include "ardour/utils.h"
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
#include "ardour/vca_manager.h"
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
#include "ardour/vca.h"
breakout control protocol code into LGPL library; fix panner buttons even more than nick did, plus some other bits and pieces git-svn-id: svn://localhost/trunk/ardour2@522 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-05-23 15:54:52 -04:00
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
#include "canvas/debug.h"
permit editing velocity bars option
2018-07-03 15:39:28 -04:00
#include "canvas/note.h"
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
#include "canvas/text.h"
Separate Ardour UI widgets into dedicated library
2017-07-15 11:38:28 -04:00
#include "widgets/ardour_spacer.h"
Move more Gtkmm2ext widgets into libwidget
2017-07-16 22:55:52 -04:00
#include "widgets/eventboxext.h"
Separate Ardour UI widgets into dedicated library
2017-07-15 11:38:28 -04:00
#include "widgets/tooltips.h"
Quote includes for control_protocol. git-svn-id: svn://localhost/ardour2/branches/3.0@4656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 13:39:39 -05:00
#include "control_protocol/control_protocol.h"
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "actions.h"
#include "analysis_window.h"
Replace some Gtk:MessageDialog with Ardour's variant This fixes some issues with stuck splash screen early on.
2020-01-15 16:01:30 -05:00
#include "ardour_message.h"
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 13:50:37 -04:00
#include "audio_clock.h"
Mostly Cosmetic/Design changes to bring trunk and midi branch closer git-svn-id: svn://localhost/ardour2/branches/midi@733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-01 13:19:38 -04:00
#include "audio_region_view.h"
Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and associated stuff are now separated (with common things in base classes). Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses all look (and really are) distinct in the GUI. git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 08:03:19 -04:00
#include "audio_streamview.h"
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
#include "audio_time_axis.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "automation_time_axis.h"
#include "bundle_manager.h"
#include "crossfade_edit.h"
#include "debug.h"
#include "editing.h"
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
#include "editing_convert.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "editor.h"
#include "editor_cursors.h"
Pull dragging code out of the Editor class into its own hierarchy. git-svn-id: svn://localhost/ardour2/branches/3.0@5113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-30 14:25:59 -04:00
#include "editor_drag.h"
Optional tabs down the LHS of the editor window to indicate edit group membership. git-svn-id: svn://localhost/ardour2/branches/3.0@5220 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-20 09:41:55 -04:00
#include "editor_group_tabs.h"
comments for BBT math methods; remove chunks from GUI; split location UI into a widget and a window; add the widget part to the editor RHS notebook. this is unfinished - it looks absurd. but its the starting point for a reworking of the location UI in its rightful place git-svn-id: svn://localhost/ardour2/branches/3.0@6071 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-12 00:47:05 -05:00
#include "editor_locations.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "editor_regions.h"
#include "editor_route_groups.h"
#include "editor_routes.h"
Pull snapshots code out of Editor class. git-svn-id: svn://localhost/ardour2/branches/3.0@5313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 19:51:58 -04:00
#include "editor_snapshots.h"
(Source List) Source property signals (gtk2 part) See: https://docs.google.com/document/d/1sI7p9RoRVZtNx2n67RvBa0_16fuZblV_lNkkKN2g93s/edit?usp=sharing
2018-11-15 10:21:55 -05:00
#include "editor_sources.h"
Make summary zoom happen based on where the drag is started, rather than needing a modifier. Change mouse pointer shape in the summary to indicate what will happen on a drag. Allow vertical zoom in the summary, which modifies track heights accordingly. git-svn-id: svn://localhost/ardour2/branches/3.0@7275 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 20:05:44 -04:00
#include "editor_summary.h"
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
#include "enums_convert.h"
add region & range loudnless report
2016-03-11 11:26:27 -05:00
#include "export_report.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "global_port_matrix.h"
#include "gui_object.h"
#include "gui_thread.h"
#include "keyboard.h"
Editor Actions Scripts & Manager
2016-02-23 09:42:53 -05:00
#include "luainstance.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "marker.h"
Context menu for applying edits to note selection.
2014-12-25 15:32:10 -05:00
#include "midi_region_view.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "midi_time_axis.h"
#include "mixer_strip.h"
provide link-editor-and-mixer-selection option. gui implementation is slightly hacky because of the implicit endless loop that the link creates git-svn-id: svn://localhost/ardour2/branches/3.0@10624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 14:33:09 -05:00
#include "mixer_ui.h"
Move mouse cursor stuff out of Editor into its own class. git-svn-id: svn://localhost/ardour2/branches/3.0@8048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-16 09:53:16 -05:00
#include "mouse_cursors.h"
Context menu for applying edits to note selection.
2014-12-25 15:32:10 -05:00
#include "note_base.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "playlist_selector.h"
#include "public_editor.h"
make the quantize dialog persistent so that settings are retained
2015-06-26 12:34:55 -04:00
#include "quantize_dialog.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "region_layering_order_editor.h"
#include "rgb_macros.h"
#include "rhythm_ferret.h"
try to keep editor+mixer treemodels in sync
2016-06-06 12:52:48 -04:00
#include "route_sorter.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "selection.h"
add region & range loudnless report
2016-03-11 11:26:27 -05:00
#include "simple_progress_dialog.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "sfdb_ui.h"
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
#include "grid_lines.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "time_axis_view.h"
Move selection/punch clocks to editor Sidebar
2016-12-16 20:31:41 -05:00
#include "time_info_box.h"
Move Timers/Timeouts from ARDOUR_UI into functions in timers.h and use PBD::Timers
2014-12-25 10:02:00 -05:00
#include "timers.h"
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
#include "ui_config.h"
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
#include "utils.h"
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
#include "vca_time_axis.h"
new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged)
2014-06-30 16:32:38 -04:00
#include "verbose_cursor.h"
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
2016-07-14 14:44:52 -04:00
#include "pbd/i18n.h"
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
using namespace std;
using namespace ARDOUR;
Separate Ardour UI widgets into dedicated library
2017-07-15 11:38:28 -04:00
using namespace ArdourWidgets;
move utility functions into a dedicated namespace
2014-06-25 15:27:37 -04:00
using namespace ARDOUR_UI_UTILS;
Large nasty commit in the form of a 5000 line patch chock-full of completely unecessary changes. (Sorry, doing a "sprint" based thing, this is the end of the first one) Achieved MIDI track and bus creation, associated Jack port and diskstream creation, and minimal GUI stuff for creating them. Should be set to start work on actually recording and playing midi to/from disk now. Relevant (significant) changes: - Creation of a Buffer class. Base class is type agnostic so things can point to a buffer but not care what kind it is (otherwise it'd be a template). Derived into AudioBuffer and MidiBuffer, with a type tag because checking type is necessary in parts of the code where dynamic_cast wouldn't be wise. Originally I considered this a hack, but passing around a type proved to be a very good solution to all the other problems (below). There is a 1:1 mapping between jack port data types and ardour Buffer types (with a conversion function), but that's easily removed if it ever becomes necessary. Having the type scoped in the Buffer class is maybe not the best spot for it, but whatever (this is proof of concept kinda stuff right now...) - IO now has a "default" port type (passed to the constructor and stored as a member), used by ensure_io (and similar) to create n ports. IO::register_***_port has a type argument that defaults to the default type if not passed. Rationale: previous IO API is identical, no changes needed to existing code, but path is paved for multiple port types in one IO, which we will need for eg synth plugin inserts, among other things. This is not quite ideal (best would be to only have the two port register functions and have them take a type), but the alternative is a lot of work (namely destroying the 'ensure' functions and everything that uses them) for very little gain. (I am convinced after quite a few tries at the whiteboard that subclassing IO in any way is not a feasible option, look at it's inheritance diagram in Doxygen and you can see why) - AudioEngine::register_audio_input_port is now register_input_port and takes a type argument. Ditto for output. - (Most significant change) AudioDiskstream abstracted into Distream, and sibling MidiDiskstream created. Very much still a work in progress, but Diskstream is there to switch references over to (most already are), which is the important part. It is still unclear what the MIDI diskstream's relation to channels is, but I'm pretty sure they will be single channel only (so SMF Type 0) since noone can come up with a reason otherwise. - MidiTrack creation. Same thing as AudioTrack but with a different default type basically. No big deal here. - Random cleanups and variable renamings etc. because I have OCD and can't help myself. :) Known broken: Loading of sessions containing MIDI tracks. git-svn-id: svn://localhost/ardour2/branches/midi@641 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-26 12:01:34 -04:00
using namespace PBD;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
using namespace Gtk;
small fixes to editor.cc git-svn-id: svn://localhost/trunk/ardour2@77 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-02 15:33:47 -05:00
using namespace Glib;
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
using namespace Gtkmm2ext;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
using namespace Editing;
All included libraries now link dynamically instead of statically. Moved items from gtk2_ardour/utils to pbd3/convert. Various cleanups. git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25 16:23:50 -04:00
using PBD::internationalize;
Merged with trunk (painfully) git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-13 03:27:52 -04:00
using PBD::atoi;
move generic parts of Keyboard into gtkmm2ext. imperfectly done, but makes modifiers available in libgtkmm2ext now git-svn-id: svn://localhost/ardour2/branches/3.0@6288 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-04 17:51:32 -05:00
using Gtkmm2ext::Keyboard;
All included libraries now link dynamically instead of statically. Moved items from gtk2_ardour/utils to pbd3/convert. Various cleanups. git-svn-id: svn://localhost/trunk/ardour2@475 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-25 16:23:50 -04:00
apply font-scale to overall layout (rulers, track-header) - fixes #6088
2014-12-28 09:01:49 -05:00
double Editor::timebar_height = 15.0;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
static const gchar *_grid_type_strings[] = {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
N_("No Grid"),
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
N_("Bar"),
N_("1/4 Note"),
N_("1/8 Note"),
N_("1/16 Note"),
N_("1/32 Note"),
N_("1/64 Note"),
N_("1/128 Note"),
N_("1/3 (8th triplet)"), // or "1/12" ?
N_("1/6 (16th triplet)"),
N_("1/12 (32nd triplet)"),
N_("1/24 (64th triplet)"),
N_("1/5 (8th quintuplet)"),
N_("1/10 (16th quintuplet)"),
N_("1/20 (32nd quintuplet)"),
N_("1/7 (8th septuplet)"),
N_("1/14 (16th septuplet)"),
N_("1/28 (32nd septuplet)"),
Timecode instead of SMPTE.
2018-02-12 10:15:26 -05:00
N_("Timecode"),
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
N_("MinSec"),
Fix a rather large naming thinko: GridTypeSamples should be CDFrames.
2018-02-26 18:02:24 -05:00
N_("CD Frames"),
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
0
};
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
static const gchar *_edit_point_strings[] = {
N_("Playhead"),
N_("Marker"),
N_("Mouse"),
0
};
add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings
2014-07-09 16:48:19 -04:00
static const gchar *_edit_mode_strings[] = {
N_("Slide"),
N_("Splice"),
N_("Ripple"),
Revert to old Lock mode (still called Lock). Also make midi notes obey the snap delta modifire
2015-05-18 13:27:50 -04:00
N_("Lock"),
add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings
2014-07-09 16:48:19 -04:00
0
};
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
static const gchar *_zoom_focus_strings[] = {
Merged with trunk R992. Completely untested other than it compiles, runs, and records somewhat (need to merge again). git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-21 15:01:50 -04:00
N_("Left"),
N_("Right"),
N_("Center"),
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
N_("Playhead"),
use new paned-sizing strategy in editor
2016-04-22 23:02:39 -04:00
N_("Mouse"),
N_("Edit point"),
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
0
};
Merge with 2.0-ongoing R2883. git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 17:22:29 -05:00
#ifdef USE_RUBBERBAND
static const gchar *_rb_opt_strings[] = {
N_("Mushy"),
N_("Smooth"),
N_("Balanced multitimbral mixture"),
N_("Unpitched percussion with stable notes"),
N_("Crisp monophonic instrumental"),
N_("Unpitched solo percussion"),
Patch from colinf to add tape-style region stretching via rubberband. Fixes #3075. git-svn-id: svn://localhost/ardour2/branches/3.0@7620 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-13 12:50:29 -04:00
N_("Resample without preserving pitch"),
Merge with 2.0-ongoing R2883. git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 17:22:29 -05:00
0
};
#endif
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* Robin says: this should be odd to accomodate cairo drawing offset (width/2 rounds up to pixel boundary) */
GTKOSX is not a valid check. Use __APPLE__
2018-02-15 17:32:37 -05:00
#ifdef __APPLE__
#define COMBO_TRIANGLE_WIDTH 19 // ArdourButton _diameter (11) + 2 * arrow-padding (2*2) + 2 * text-padding (2*5)
Revert TRIANGLE_WIDTH for mac. Must be a pango/cairo issue on mac.
2018-02-14 09:15:45 -05:00
#else
#define COMBO_TRIANGLE_WIDTH 11 // as-measured for win/linux.
#endif
Use text to specify combo box padding for better font/display tolerance. Consistent mixer strip button height. The latter works by setting all the button size request heights to the calculated height of the alphabet. Thus, all buttons of the same class will be the same height regardless of their actual text.
2014-07-30 18:27:12 -04:00
Merged with trunk R1612. git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-18 02:07:08 -04:00
Editor::Editor ()
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
: PublicEditor (global_hpacker)
, editor_mixer_strip_width (Wide)
, constructed (false)
, _playlist_selector (0)
Move selection/punch clocks to editor Sidebar
2016-12-16 20:31:41 -05:00
, _time_info_box (0)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, no_save_visual (false)
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
, _leftmost_sample (0)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, samples_per_pixel (2048)
, zoom_focus (ZoomFocusPlayhead)
, mouse_mode (MouseObject)
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
, pre_internal_grid_type (GridTypeBeat)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, pre_internal_snap_mode (SnapOff)
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
, internal_grid_type (GridTypeBeat)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, internal_snap_mode (SnapOff)
, _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
, _notebook_shrunk (false)
, location_marker_color (0)
, location_range_color (0)
, location_loop_color (0)
, location_punch_color (0)
, location_cd_marker_color (0)
, entered_marker (0)
, _show_marker_lines (false)
, clicked_axisview (0)
, clicked_routeview (0)
, clicked_regionview (0)
, clicked_selection (0)
, clicked_control_point (0)
, button_release_can_deselect (true)
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
, _mouse_changed_selection (false)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, _popup_region_menu_item (0)
, _track_canvas (0)
, _track_canvas_viewport (0)
, within_track_canvas (false)
, _verbose_cursor (0)
, tempo_group (0)
, meter_group (0)
, marker_group (0)
, range_marker_group (0)
, transport_marker_group (0)
, cd_marker_group (0)
, _time_markers_group (0)
, hv_scroll_group (0)
, h_scroll_group (0)
, cursor_scroll_group (0)
, no_scroll_group (0)
, _trackview_group (0)
, _drag_motion_group (0)
, _canvas_drop_zone (0)
, no_ruler_shown_update (false)
, ruler_grabbed_widget (0)
, ruler_dialog (0)
, minsec_mark_interval (0)
, minsec_mark_modulo (0)
, minsec_nmarks (0)
Initialize some uninitialized variables Editor::redisplay_tempo() is called early on, before Editor::set_timecode_ruler_scale() and Editor::compute_bbt_ruler_scale () are called. That is a bug which needs fixing (initial tempo+grid display) . Still, uninitialized vars are not good.
2017-07-23 13:20:35 -04:00
, timecode_ruler_scale (timecode_show_many_hours)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, timecode_mark_modulo (0)
, timecode_nmarks (0)
, _samples_ruler_interval (0)
Initialize some uninitialized variables Editor::redisplay_tempo() is called early on, before Editor::set_timecode_ruler_scale() and Editor::compute_bbt_ruler_scale () are called. That is a bug which needs fixing (initial tempo+grid display) . Still, uninitialized vars are not good.
2017-07-23 13:20:35 -04:00
, bbt_ruler_scale (bbt_show_many)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, bbt_bars (0)
, bbt_nmarks (0)
, bbt_bar_helper_on (0)
, bbt_accent_modulo (0)
, timecode_ruler (0)
, bbt_ruler (0)
, samples_ruler (0)
, minsec_ruler (0)
, visible_timebars (0)
, editor_ruler_menu (0)
, tempo_bar (0)
, meter_bar (0)
, marker_bar (0)
, range_marker_bar (0)
, transport_marker_bar (0)
, cd_marker_bar (0)
First cut of some Pro-tools inspired editing features; linked play/play range and linked object/range modes. git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-01 17:11:15 -05:00
, minsec_label (_("Mins:Secs"))
remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-28 16:51:28 -04:00
, bbt_label (_("Bars:Beats"))
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 10:38:58 -04:00
, timecode_label (_("Timecode"))
Rename Frames ruler to Samples. git-svn-id: svn://localhost/ardour2/branches/3.0@8529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18 07:51:02 -05:00
, samples_label (_("Samples"))
remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-28 16:51:28 -04:00
, tempo_label (_("Tempo"))
, meter_label (_("Meter"))
, mark_label (_("Location Markers"))
, range_mark_label (_("Range Markers"))
, transport_mark_label (_("Loop/Punch Ranges"))
, cd_mark_label (_("CD Markers"))
videotimline squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-12 17:00:09 -04:00
, videotl_label (_("Video Timeline"))
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, videotl_group (0)
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
, snapped_cursor (0)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, playhead_cursor (0)
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
, _region_boundary_cache_dirty (true)
remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-28 16:51:28 -04:00
, edit_packer (4, 4, true)
, vertical_adjustment (0.0, 0.0, 10.0, 400.0)
removal of sundry Adjustments and consolidation of scrolling around two editor-owned Adjustments
2013-04-13 07:29:49 -04:00
, horizontal_adjustment (0.0, 0.0, 1e16)
, unused_adjustment (0.0, 0.0, 10.0, 400.0)
, controls_layout (unused_adjustment, vertical_adjustment)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, _scroll_callbacks (0)
, _visible_canvas_width (0)
, _visible_canvas_height (0)
, _full_canvas_height (0)
, edit_controls_left_menu (0)
, edit_controls_right_menu (0)
Coalesce visual changes to canvas/items and allow canvas to render First visual change will be processed as normal and then blocked until the canvas renders the change. If further visual changes need processing then Editor::pre_render callback will schedule another expose/redraw/render. This prevents an issue where idle_visual_changer is called many times in response to events(keys/motion/etc) but the canvas does not get a chance to render any but the last one which results in a big pause/jump. This results in a more responsive canvas and in particular a smoother and more predictable zooming experience.
2017-04-01 07:33:59 -04:00
, visual_change_queued(false)
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
, _last_update_time (0)
, _err_screen_engine (0)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, cut_buffer_start (0)
, cut_buffer_length (0)
, button_bindings (0)
Fix pasting automation at 0
2017-07-26 21:22:21 -04:00
, last_paste_pos (-1)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, paste_count (0)
, sfbrowser (0)
, current_interthread_info (0)
, analysis_window (0)
, select_new_marker (false)
, last_scrub_x (0)
, scrubbing_direction (0)
, scrub_reversals (0)
, scrub_reverse_distance (0)
, have_pending_keyboard_selection (false)
, pending_keyboard_selection_start (0)
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
, _grid_type (GridTypeBeat)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, _snap_mode (SnapOff)
, ignore_gui_changes (false)
, _drags (new DragManager (this))
, lock_dialog (0)
stop using C++11 structure initializer
2015-07-08 12:45:36 -04:00
/* , last_event_time { 0, 0 } */ /* this initialization style requires C++11 */
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, _dragging_playhead (false)
, _follow_playhead (true)
, _stationary_playhead (false)
, _maximised (false)
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
, grid_lines (0)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, global_rect_group (0)
, time_line_group (0)
Tempo ramps - add some right-click options to meter and tempo markers.
2016-04-13 14:16:24 -04:00
, tempo_marker_menu (0)
, meter_marker_menu (0)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, marker_menu (0)
, range_marker_menu (0)
, new_transport_marker_menu (0)
, marker_menu_item (0)
, bbt_beat_subdivision (4)
, _visible_track_count (-1)
, toolbar_selection_clock_table (2,3)
, automation_mode_button (_("mode"))
cut buffer must not mess around with libardour selection Fixes range mode selection/cut/copy that would previously clear track selection
2017-06-07 12:14:44 -04:00
, selection (new Selection (this, true))
, cut_buffer (new Selection (this, false))
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, _selection_memento (new SelectionMemento())
, _all_region_actions_sensitized (false)
, _ignore_region_action (false)
, _last_region_menu_was_main (false)
Don't scroll-jump when selecting all tracks
2017-02-17 19:25:13 -05:00
, _track_selection_change_without_scroll (false)
Tweak 842d758e: selection & move into view Use separate editor + mixer flags for moving selected tracks into view. Changing selection in the Editor will only pan the mixer-view and vice- versa. This fixes an issue with the track that is being clicked-on to be moved out of view (due to groups)
2017-10-21 11:27:03 -04:00
, _editor_track_selection_change_without_scroll (false)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, cd_marker_bar_drag_rect (0)
, range_bar_drag_rect (0)
, transport_bar_drag_rect (0)
, transport_bar_range_rect (0)
, transport_bar_preroll_rect (0)
, transport_bar_postroll_rect (0)
, transport_loop_range_rect (0)
, transport_punch_range_rect (0)
, transport_punchin_line (0)
, transport_punchout_line (0)
, transport_preroll_rect (0)
, transport_postroll_rect (0)
, temp_location (0)
, rubberband_rect (0)
, _route_groups (0)
, _routes (0)
, _regions (0)
, _snapshots (0)
, _locations (0)
, autoscroll_horizontal_allowed (false)
, autoscroll_vertical_allowed (false)
, autoscroll_cnt (0)
, autoscroll_widget (0)
, show_gain_after_trim (false)
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
, selection_op_cmd_depth (0)
, selection_op_history_it (0)
Don't save instant while loading instant.xml opening a recent session from a session can result in: Editor::constructed and session_loaded() being true. A partial instant_save can occur (not to mention: invalid XMLnode iterators)
2016-05-18 14:06:20 -04:00
, no_save_instant (false)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, current_timefx (0)
, current_mixer_strip (0)
, show_editor_mixer_when_tracks_arrive (false)
, nudge_clock (new AudioClock (X_("nudge"), false, X_("nudge"), true, false, true))
, current_stepping_trackview (0)
, last_track_height_step_timestamp (0)
, entered_track (0)
, entered_regionview (0)
, clear_entered_track (false)
, _edit_point (EditAtMouse)
, meters_running (false)
, rhythm_ferret (0)
, _have_idled (false)
, resize_idle_id (-1)
, _pending_resize_amount (0)
, _pending_resize_view (0)
remove all MIDI-specific editing modes by making standard work either at object level or within (e.g. notes, etc) ; make tool buttons proxies for GtkActions ; internal sends have their own BufferSet now, instead of using Session ones; don't make internal sends to the monitor bus active when added to the Route git-svn-id: svn://localhost/ardour2/branches/3.0@5434 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-28 16:51:28 -04:00
, _pending_locate_request (false)
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
, _pending_initial_locate (false)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, _summary (0)
, _group_tabs (0)
, _last_motion_y (0)
, layering_order_editor (0)
Paste to the source of a copy if there are no selected tracks (rather than using the track under the mouse). Fixes #3333. git-svn-id: svn://localhost/ardour2/branches/3.0@7729 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-01 21:06:19 -04:00
, _last_cut_copy_source_track (0)
(1) use select next/previous row functions for tab/shift-tab navigation in region list (2) add start (in-file) column to region list (3) make region list parent/child relationships work for MIDI regions (4) fix up handling of region selection changes driven by region list selection (i think i fixed, anyway) (5) don't put text in whole file rows for columns where it makes no sense like position or mute etc. git-svn-id: svn://localhost/ardour2/branches/3.0@7850 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-28 13:27:58 -04:00
, _region_selection_change_updates_region_list (true)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
, _cursors (0)
provide link-editor-and-mixer-selection option. gui implementation is slightly hacky because of the implicit endless loop that the link creates git-svn-id: svn://localhost/ardour2/branches/3.0@10624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 14:33:09 -05:00
, _following_mixer_selection (false)
Slightly unpleasant hack to stop control points being unselected when you ctrl-drag a selected point in order to do a push drag. git-svn-id: svn://localhost/ardour2/branches/3.0@12502 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 10:39:48 -04:00
, _control_point_toggled_on_press (false)
Hacky fix for track height step losing 'grip' on the track being resized (#4503). git-svn-id: svn://localhost/ardour2/branches/3.0@12747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-17 12:57:21 -04:00
, _stepping_axis_view (0)
make the quantize dialog persistent so that settings are retained
2015-06-26 12:34:55 -04:00
, quantize_dialog (0)
use Tracks' MainMenuDisabler during session lock (could be improved with more RAII)
2015-05-06 12:10:41 -04:00
, _main_menu_disabler (0)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
/* we are a singleton */
PublicEditor::_instance = this;
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
_have_idled = false;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
stop using C++11 structure initializer
2015-07-08 12:45:36 -04:00
last_event_time.tv_sec = 0;
last_event_time.tv_usec = 0;
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
selection_op_history.clear();
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
before.clear();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
grid_type_strings = I18N (_grid_type_strings);
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
zoom_focus_strings = I18N (_zoom_focus_strings);
add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings
2014-07-09 16:48:19 -04:00
edit_mode_strings = I18N (_edit_mode_strings);
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
edit_point_strings = I18N (_edit_point_strings);
Merge with 2.0-ongoing R2883. git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 17:22:29 -05:00
#ifdef USE_RUBBERBAND
rb_opt_strings = I18N (_rb_opt_strings);
Patch from colinf to add tape-style region stretching via rubberband. Fixes #3075. git-svn-id: svn://localhost/ardour2/branches/3.0@7620 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-13 12:50:29 -04:00
rb_current_opt = 4;
Merge with 2.0-ongoing R2883. git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 17:22:29 -05:00
#endif
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
build_edit_mode_menu();
build_zoom_focus_menu();
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
build_track_count_menu();
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
build_grid_type_menu();
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
build_edit_point_menu();
cleanup various merge conflict resolution errors/omissions
2015-10-22 19:19:24 -04:00
location_marker_color = UIConfiguration::instance().color ("location marker");
location_range_color = UIConfiguration::instance().color ("location range");
location_cd_marker_color = UIConfiguration::instance().color ("location cd marker");
location_loop_color = UIConfiguration::instance().color ("location loop");
location_punch_color = UIConfiguration::instance().color ("location punch");
Make the FFT Anaylsis optional and disabled by default until further discussion. git-svn-id: svn://localhost/trunk/ardour2@386 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 22:27:58 -05:00
fix ruler scaling -- #7226
2017-05-05 07:58:59 -04:00
timebar_height = std::max (12., ceil (15. * UIConfiguration::instance().get_ui_scale()));
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
apply font-scale to overall layout (rulers, track-header) - fixes #6088
2014-12-28 09:01:49 -05:00
TimeAxisView::setup_sizes ();
rename Marker class Classes are in the global namespace. OSX has a flat namespace and OSX32bit/Carbon has a Marker too.
2015-07-23 07:23:47 -04:00
ArdourMarker::setup_sizes (timebar_height);
Tempo ramps - clean up tempo curve a bit.
2016-05-07 13:54:52 -04:00
TempoCurve::setup_sizes (timebar_height);
apply font-scale to overall layout (rulers, track-header) - fixes #6088
2014-12-28 09:01:49 -05:00
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
bbt_label.set_name ("EditorRulerLabel");
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
bbt_label.set_size_request (-1, (int)timebar_height);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
bbt_label.set_alignment (1.0, 0.5);
bbt_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
bbt_label.hide ();
bbt_label.set_no_show_all();
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
minsec_label.set_name ("EditorRulerLabel");
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
minsec_label.set_size_request (-1, (int)timebar_height);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
minsec_label.set_alignment (1.0, 0.5);
minsec_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
minsec_label.hide ();
minsec_label.set_no_show_all();
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
timecode_label.set_name ("EditorRulerLabel");
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 10:38:58 -04:00
timecode_label.set_size_request (-1, (int)timebar_height);
timecode_label.set_alignment (1.0, 0.5);
timecode_label.set_padding (5,0);
timecode_label.hide ();
timecode_label.set_no_show_all();
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
samples_label.set_name ("EditorRulerLabel");
Rename Frames ruler to Samples. git-svn-id: svn://localhost/ardour2/branches/3.0@8529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18 07:51:02 -05:00
samples_label.set_size_request (-1, (int)timebar_height);
samples_label.set_alignment (1.0, 0.5);
samples_label.set_padding (5,0);
samples_label.hide ();
samples_label.set_no_show_all();
merge 2.0-ongoing into 3.0 @ 3581 - 3710 git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 17:27:39 -04:00
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
tempo_label.set_name ("EditorRulerLabel");
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
tempo_label.set_size_request (-1, (int)timebar_height);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
tempo_label.set_alignment (1.0, 0.5);
tempo_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
tempo_label.hide();
tempo_label.set_no_show_all();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
meter_label.set_name ("EditorRulerLabel");
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
meter_label.set_size_request (-1, (int)timebar_height);
pack zoom controls into upper right of editor table/packer git-svn-id: svn://localhost/ardour2/branches/3.0@5209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 14:11:04 -04:00
meter_label.set_alignment (1.0, 0.5);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
meter_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
meter_label.hide();
meter_label.set_no_show_all();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
mark_label.set_name ("EditorRulerLabel");
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
mark_label.set_size_request (-1, (int)timebar_height);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
mark_label.set_alignment (1.0, 0.5);
mark_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
mark_label.hide();
mark_label.set_no_show_all();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
cd_mark_label.set_name ("EditorRulerLabel");
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
cd_mark_label.set_size_request (-1, (int)timebar_height);
cd_mark_label.set_alignment (1.0, 0.5);
cd_mark_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
cd_mark_label.hide();
cd_mark_label.set_no_show_all();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
videotimline squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-12 17:00:09 -04:00
videotl_bar_height = 4;
videotl_label.set_name ("EditorRulerLabel");
videotl_label.set_size_request (-1, (int)timebar_height * videotl_bar_height);
videotl_label.set_alignment (1.0, 0.5);
videotl_label.set_padding (5,0);
videotl_label.hide();
videotl_label.set_no_show_all();
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
range_mark_label.set_name ("EditorRulerLabel");
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
range_mark_label.set_size_request (-1, (int)timebar_height);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
range_mark_label.set_alignment (1.0, 0.5);
range_mark_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
range_mark_label.hide();
range_mark_label.set_no_show_all();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
tweak font/style stuff for the labels used on the left side of rulers git-svn-id: svn://localhost/ardour2/branches/3.0@13988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-24 08:17:36 -05:00
transport_mark_label.set_name ("EditorRulerLabel");
Fly my pretties! git-svn-id: svn://localhost/trunk/ardour2@28 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 16:33:00 -04:00
transport_mark_label.set_size_request (-1, (int)timebar_height);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
transport_mark_label.set_alignment (1.0, 0.5);
transport_mark_label.set_padding (5,0);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
transport_mark_label.hide();
transport_mark_label.set_no_show_all();
initialize_canvas ();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
use moved version of reset_focus()
2016-09-06 16:17:39 -04:00
CairoWidget::set_focus_handler (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::reset_focus));
set the CairoWidget focus handler; reset focus when the mouse pointer leaves the Editor window
2014-09-16 12:46:39 -04:00
fix deadlock in protocol manager startup; fix some other ::set_session() SNAFUs; remove last boost::signals2::connection member from libardour git-svn-id: svn://localhost/ardour2/branches/3.0@6375 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:36:52 -05:00
_summary = new EditorSummary (this);
merge 2.0-ongoing into 3.0 @ 3581 - 3710 git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 17:27:39 -04:00
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
selection->TimeChanged.connect (sigc::mem_fun(*this, &Editor::time_selection_changed));
SoloSelection: gui part.
2018-02-11 10:39:45 -05:00
selection->TracksChanged.connect (sigc::mem_fun(*this, &Editor::track_selection_changed));
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
editor_regions_selection_changed_connection = selection->RegionsChanged.connect (sigc::mem_fun(*this, &Editor::region_selection_changed));
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
selection->PointsChanged.connect (sigc::mem_fun(*this, &Editor::point_selection_changed));
selection->MarkersChanged.connect (sigc::mem_fun(*this, &Editor::marker_selection_changed));
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
edit_controls_vbox.set_spacing (0);
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
vertical_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &Editor::tie_vertical_scrolling), true);
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
_track_canvas->signal_map_event().connect (sigc::mem_fun (*this, &Editor::track_canvas_map_handler));
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
Optional tabs down the LHS of the editor window to indicate edit group membership. git-svn-id: svn://localhost/ardour2/branches/3.0@5220 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-20 09:41:55 -04:00
HBox* h = manage (new HBox);
_group_tabs = new EditorGroupTabs (this);
goodbye Profile->...trx
2019-09-25 15:02:31 -04:00
h->pack_start (*_group_tabs, PACK_SHRINK);
Optional tabs down the LHS of the editor window to indicate edit group membership. git-svn-id: svn://localhost/ardour2/branches/3.0@5220 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-20 09:41:55 -04:00
h->pack_start (edit_controls_vbox);
controls_layout.add (*h);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
controls_layout.set_name ("EditControlsBase");
forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
2014-06-09 10:02:38 -04:00
controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::SCROLL_MASK);
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
controls_layout.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::edit_controls_button_release));
forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
2014-06-09 10:02:38 -04:00
controls_layout.signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::control_layout_scroll), false);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
Move mouse cursor stuff out of Editor into its own class. git-svn-id: svn://localhost/ardour2/branches/3.0@8048 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-16 09:53:16 -05:00
_cursors = new MouseCursors;
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
_cursors->set_cursor_set (UIConfiguration::instance().get_icon_set());
cerr << "Set cursor set to " << UIConfiguration::instance().get_icon_set() << endl;
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
Fix various cursor problems. Add a new scoped cursor system that makes it much harder to screw up and end up with stick cursors and so on.
2014-12-20 01:11:28 -05:00
/* Push default cursor to ever-present bottom of cursor stack. */
push_canvas_cursor(_cursors->grabber);
lots of tweaking and adding debug output including operator<</dump(ostream&) methods to help visualize canvas structure
2013-04-05 11:27:26 -04:00
ArdourCanvas::GtkCanvas* time_pad = manage (new ArdourCanvas::GtkCanvas ());
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
commit immediately post linking
2013-04-04 18:45:27 -04:00
ArdourCanvas::Line* pad_line_1 = new ArdourCanvas::Line (time_pad->root());
pad_line_1->set (ArdourCanvas::Duple (0.0, 1.0), ArdourCanvas::Duple (100.0, 1.0));
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
pad_line_1->set_outline_color (0xFF0000FF);
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
pad_line_1->show();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* CAIROCANVAS */
lots of tweaking and adding debug output including operator<</dump(ostream&) methods to help visualize canvas structure
2013-04-05 11:27:26 -04:00
time_pad->show();
Don't tear down and rebuild all rulers on each visibility change, fix duplicated secondary-m in SAE bindings, avoid dirty master channel updates on osx, simplify ruler scale calculation params. git-svn-id: svn://localhost/ardour2/branches/3.0@3995 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-22 02:41:51 -04:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
edit_packer.set_col_spacings (0);
edit_packer.set_row_spacings (0);
edit_packer.set_homogeneous (false);
lots of fidgety work to get track renaming to work correctly now that we have to rename audio files too; some GUI tweaks git-svn-id: svn://localhost/trunk/ardour2@404 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-17 12:39:21 -05:00
edit_packer.set_border_width (0);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
edit_packer.set_name ("EditorWindow");
more GUI tweaks git-svn-id: svn://localhost/ardour2/branches/3.0@3728 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-14 15:52:34 -04:00
use canvas rulers now instead of gtk widgets Some bugs that exist in master are still present.
2014-06-11 23:54:04 -04:00
time_bars_event_box.add (time_bars_vbox);
time_bars_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
time_bars_event_box.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::ruler_label_button_release));
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
ArdourWidgets::ArdourDropShadow *axis_view_shadow = manage (new (ArdourWidgets::ArdourDropShadow));
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
axis_view_shadow->set_size_request (4, -1);
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
axis_view_shadow->set_name("EditorWindow");
axis_view_shadow->show();
edit_packer.attach (*axis_view_shadow, 0, 1, 0, 2, FILL, FILL|EXPAND, 0, 0);
use canvas rulers now instead of gtk widgets Some bugs that exist in master are still present.
2014-06-11 23:54:04 -04:00
/* labels for the time bars */
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
edit_packer.attach (time_bars_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0);
pack zoom controls into upper right of editor table/packer git-svn-id: svn://localhost/ardour2/branches/3.0@5209 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 14:11:04 -04:00
/* track controls */
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
edit_packer.attach (controls_layout, 1, 2, 1, 2, FILL, FILL|EXPAND, 0, 0);
use canvas rulers now instead of gtk widgets Some bugs that exist in master are still present.
2014-06-11 23:54:04 -04:00
/* canvas */
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
edit_packer.attach (*_track_canvas_viewport, 2, 3, 0, 2, FILL|EXPAND, FILL|EXPAND, 0, 0);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Complete edit toolbar overhaul git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 04:03:43 -04:00
bottom_hbox.set_border_width (2);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
bottom_hbox.set_spacing (3);
use CoreSelection for track selection
2017-05-05 07:31:49 -04:00
PresentationInfo::Change.connect (*this, MISSING_INVALIDATOR, boost::bind (&Editor::presentation_info_changed, this, _1), gui_context());
Split route group list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 14:37:15 -04:00
_route_groups = new EditorRouteGroups (this);
_routes = new EditorRoutes (this);
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
_regions = new EditorRegions (this);
(Source List) Source property signals (gtk2 part) See: https://docs.google.com/document/d/1sI7p9RoRVZtNx2n67RvBa0_16fuZblV_lNkkKN2g93s/edit?usp=sharing
2018-11-15 10:21:55 -05:00
_sources = new EditorSources (this);
Pull snapshots code out of Editor class. git-svn-id: svn://localhost/ardour2/branches/3.0@5313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 19:51:58 -04:00
_snapshots = new EditorSnapshots (this);
comments for BBT math methods; remove chunks from GUI; split location UI into a widget and a window; add the widget part to the editor RHS notebook. this is unfinished - it looks absurd. but its the starting point for a reworking of the location UI in its rightful place git-svn-id: svn://localhost/ardour2/branches/3.0@6071 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-12 00:47:05 -05:00
_locations = new EditorLocations (this);
Save/Restore TimeInfoBox clock modes The clocks are not transient, so ARDOUR_UI::store_clock_modes takes care of saving the state and the clock restores itself.
2017-03-10 14:39:46 -05:00
_time_info_box = new TimeInfoBox ("EditorTimeInfo", true);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
correctly connect to Location static signals
2014-09-17 09:37:39 -04:00
/* these are static location signals */
Location::start_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
Location::end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
Location::changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
Re-order editor sidebar: prioritize "Tracks & Busses"
2019-08-12 12:28:19 -04:00
add_notebook_page (_("Tracks & Busses"), _routes->widget ());
(Source List) Source property signals (gtk2 part) See: https://docs.google.com/document/d/1sI7p9RoRVZtNx2n67RvBa0_16fuZblV_lNkkKN2g93s/edit?usp=sharing
2018-11-15 10:21:55 -05:00
add_notebook_page (_("Sources"), _sources->widget ());
Make editor list notebook shrink or expand when the tab is double-clicked, as per #3662. git-svn-id: svn://localhost/ardour2/branches/3.0@8443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:06:51 -05:00
add_notebook_page (_("Regions"), _regions->widget ());
add_notebook_page (_("Snapshots"), _snapshots->widget ());
Remove a couple of uses of the word Route in the UI. git-svn-id: svn://localhost/ardour2/branches/3.0@12117 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-28 11:25:59 -04:00
add_notebook_page (_("Track & Bus Groups"), _route_groups->widget ());
Make editor list notebook shrink or expand when the tab is double-clicked, as per #3662. git-svn-id: svn://localhost/ardour2/branches/3.0@8443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:06:51 -05:00
add_notebook_page (_("Ranges & Marks"), _locations->widget ());
_the_notebook.set_show_tabs (true);
_the_notebook.set_scrollable (true);
_the_notebook.popup_disable ();
_the_notebook.set_tab_pos (Gtk::POS_RIGHT);
_the_notebook.show_all ();
_notebook_shrunk = false;
Pack the summarizer in a vpaned instead of the edit_packer git-svn-id: svn://localhost/ardour2/branches/3.0@5211 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 16:10:43 -04:00
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
/* Pick up some settings we need to cache, early */
XMLNode* settings = ARDOUR_UI::instance()->editor_settings();
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (settings) {
settings->get_property ("notebook-shrunk", _notebook_shrunk);
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
}
use pane position mgmt on appropriate panes
2016-06-13 09:53:10 -04:00
editor_summary_pane.set_check_divider_position (true);
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
editor_summary_pane.add (edit_packer);
make strip-as-GUI-for-send work for metering too ; frame around session summary widget ; tooltip for editor group tabs ; route group dialog name entry is now activatable (return == click on ok) git-svn-id: svn://localhost/ardour2/branches/3.0@6137 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-20 10:26:34 -05:00
Editor Summary: Changes to behavior * Remove up/down buttons. * Allow the summary to shrink smaller. * Vertical drag results in zoom. * Scroll-wheel results in zoom. * Tweak mouse cursor to better indicate behaviors. * ToDo: refactor the zooming code.
2017-07-18 11:37:35 -04:00
Button* summary_arrow_left = manage (new Button);
summary_arrow_left->add (*manage (new Arrow (ARROW_LEFT, SHADOW_NONE)));
summary_arrow_left->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), LEFT)));
summary_arrow_left->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release));
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Editor Summary: Changes to behavior * Remove up/down buttons. * Allow the summary to shrink smaller. * Vertical drag results in zoom. * Scroll-wheel results in zoom. * Tweak mouse cursor to better indicate behaviors. * ToDo: refactor the zooming code.
2017-07-18 11:37:35 -04:00
Button* summary_arrow_right = manage (new Button);
summary_arrow_right->add (*manage (new Arrow (ARROW_RIGHT, SHADOW_NONE)));
summary_arrow_right->signal_pressed().connect (sigc::hide_return (sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), RIGHT)));
summary_arrow_right->signal_released().connect (sigc::mem_fun (*this, &Editor::scroll_release));
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar. git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:10:06 -05:00
VBox* summary_arrows_left = manage (new VBox);
Editor Summary: Changes to behavior * Remove up/down buttons. * Allow the summary to shrink smaller. * Vertical drag results in zoom. * Scroll-wheel results in zoom. * Tweak mouse cursor to better indicate behaviors. * ToDo: refactor the zooming code.
2017-07-18 11:37:35 -04:00
summary_arrows_left->pack_start (*summary_arrow_left);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar. git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:10:06 -05:00
VBox* summary_arrows_right = manage (new VBox);
Editor Summary: Changes to behavior * Remove up/down buttons. * Allow the summary to shrink smaller. * Vertical drag results in zoom. * Scroll-wheel results in zoom. * Tweak mouse cursor to better indicate behaviors. * ToDo: refactor the zooming code.
2017-07-18 11:37:35 -04:00
summary_arrows_right->pack_start (*summary_arrow_right);
Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar. git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:10:06 -05:00
Revert frame -> sample changes where it's a frame as in Gtk::Frame
2018-06-09 13:08:15 -04:00
Frame* summary_frame = manage (new Frame);
summary_frame->set_shadow_type (Gtk::SHADOW_ETCHED_IN);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Revert frame -> sample changes where it's a frame as in Gtk::Frame
2018-06-09 13:08:15 -04:00
summary_frame->add (*_summary);
summary_frame->show ();
make strip-as-GUI-for-send work for metering too ; frame around session summary widget ; tooltip for editor group tabs ; route group dialog name entry is now activatable (return == click on ok) git-svn-id: svn://localhost/ardour2/branches/3.0@6137 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-20 10:26:34 -05:00
Fix show/hide of editor summary. git-svn-id: svn://localhost/ardour2/branches/3.0@6385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 20:13:06 -05:00
_summary_hbox.pack_start (*summary_arrows_left, false, false);
Revert frame -> sample changes where it's a frame as in Gtk::Frame
2018-06-09 13:08:15 -04:00
_summary_hbox.pack_start (*summary_frame, true, true);
Fix show/hide of editor summary. git-svn-id: svn://localhost/ardour2/branches/3.0@6385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 20:13:06 -05:00
_summary_hbox.pack_start (*summary_arrows_right, false, false);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
goodbye Profile->...trx
2019-09-25 15:02:31 -04:00
editor_summary_pane.add (_summary_hbox);
use pane position mgmt on appropriate panes
2016-06-13 09:53:10 -04:00
edit_pane.set_check_divider_position (true);
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
edit_pane.add (editor_summary_pane);
goodbye Profile->...trx
2019-09-25 15:02:31 -04:00
_editor_list_vbox.pack_start (*_time_info_box, false, false, 0);
_editor_list_vbox.pack_start (_the_notebook);
edit_pane.add (_editor_list_vbox);
edit_pane.set_child_minsize (_editor_list_vbox, 30); /* rough guess at width of notebook tabs */
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
set minimum size for editor list
2016-05-27 21:26:56 -04:00
edit_pane.set_drag_cursor (*_cursors->expand_left_right);
editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down);
Reduce default summary size and remember it across saves. Fixes #3205. git-svn-id: svn://localhost/ardour2/branches/3.0@7243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-07 21:29:33 -04:00
handle old-version pane positions by ignoring them
2016-05-29 13:43:56 -04:00
float fract;
Remove LocaleGuards from Editor class All float <=> string conversions are now done using locale independent PBD::to_string/string_to() via XMLNode::get/set_property
2016-09-04 18:02:36 -04:00
if (!settings || !settings->get_property ("edit-horizontal-pane-pos", fract) || fract > 1.0) {
/* initial allocation is 90% to canvas, 10% to notebook */
fract = 0.90;
}
edit_pane.set_divider (0, fract);
handle old-version pane positions by ignoring them
2016-05-29 13:43:56 -04:00
Remove LocaleGuards from Editor class All float <=> string conversions are now done using locale independent PBD::to_string/string_to() via XMLNode::get/set_property
2016-09-04 18:02:36 -04:00
if (!settings || !settings->get_property ("edit-vertical-pane-pos", fract) || fract > 1.0) {
/* initial allocation is 90% to canvas, 10% to summary */
fract = 0.90;
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
}
Remove LocaleGuards from Editor class All float <=> string conversions are now done using locale independent PBD::to_string/string_to() via XMLNode::get/set_property
2016-09-04 18:02:36 -04:00
editor_summary_pane.set_divider (0, fract);
use the pane watcher to prevent the nastiness that occurs when the RHS editor list is dragged so that the pane handle "vanishes" into the tabs. this used to only be a problem on OS X, but a variation of the problem is there on X11 too (fixes #4410) git-svn-id: svn://localhost/ardour2/branches/3.0@12821 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-22 12:48:56 -04:00
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
global_vpacker.set_spacing (0);
Transport Layout: * Remove some redundant containers and frames, for a cleaner look. * Adjust transport button spacing and sizes to more closely match the editor toolbar.
2016-12-18 10:02:13 -05:00
global_vpacker.set_border_width (0);
repack widgets, and add some spacer elements
2016-12-18 14:29:19 -05:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* the next three EventBoxes provide the ability for their child widgets to have a background color. That is all. */
Add comment regarding themeable boxes
2017-01-18 19:28:21 -05:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
Gtk::EventBox* ebox = manage (new Gtk::EventBox); // a themeable box
Allow editor toolbar and background to be themeable.
2017-01-18 19:21:48 -05:00
ebox->set_name("EditorWindow");
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
ebox->add (ebox_hpacker);
Allow editor toolbar and background to be themeable.
2017-01-18 19:21:48 -05:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
Gtk::EventBox* epane_box = manage (new EventBoxExt); // a themeable box
Allow editor toolbar and background to be themeable.
2017-01-18 19:21:48 -05:00
epane_box->set_name("EditorWindow");
epane_box->add (edit_pane);
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
Gtk::EventBox* epane_box2 = manage (new EventBoxExt); // a themeable box
Allow editor toolbar and background to be themeable.
2017-01-18 19:21:48 -05:00
epane_box2->set_name("EditorWindow");
epane_box2->add (global_vpacker);
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
ArdourWidgets::ArdourDropShadow *toolbar_shadow = manage (new (ArdourWidgets::ArdourDropShadow));
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
toolbar_shadow->set_size_request (-1, 4);
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
toolbar_shadow->set_mode(ArdourWidgets::ArdourDropShadow::DropShadowBoth);
toolbar_shadow->set_name("EditorWindow");
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
toolbar_shadow->show();
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
global_vpacker.pack_start (*toolbar_shadow, false, false);
Allow editor toolbar and background to be themeable.
2017-01-18 19:21:48 -05:00
global_vpacker.pack_start (*ebox, false, false);
global_vpacker.pack_start (*epane_box, true, true);
global_hpacker.pack_start (*epane_box2, true, true);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
get current tab on startup correct. Note that Gtk::Notebook will not switch to a page with an invisible widget. This took me TOO LONG to discover. Also move code around between files
2015-07-27 17:12:35 -04:00
/* need to show the "contents" widget so that notebook will show if tab is switched to
*/
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
global_hpacker.show ();
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
ebox_hpacker.show();
ebox->show();
get current tab on startup correct. Note that Gtk::Notebook will not switch to a page with an invisible widget. This took me TOO LONG to discover. Also move code around between files
2015-07-27 17:12:35 -04:00
many options moved to menus, region list context menu sort of operational git-svn-id: svn://localhost/trunk/ardour2@219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-31 13:20:42 -05:00
/* register actions now so that set_state() can find them and set toggles/checks etc */
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
tell the editor to try to load editor.bindings
2015-07-15 15:05:30 -04:00
load_bindings ();
change action group owner pointer to be the relevant keybindings; reorder setting keybindings value and defining actions The reorder is required so that the value of "bindings" has been set and is meaningful
2018-12-11 05:06:26 -05:00
register_actions ();
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
add MIDI panic action (which has to be on a menu, sigh ... stupid GTK) git-svn-id: svn://localhost/ardour2/branches/3.0@5658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-09-12 13:49:57 -04:00
setup_toolbar ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
_playlist_selector = new PlaylistSelector();
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
_playlist_selector->signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
RegionView::RegionViewGoingAway.connect (*this, invalidator (*this), boost::bind (&Editor::catch_vanishing_regionview, this, _1), gui_context());
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
/* nudge stuff */
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
nudge_forward_button.set_name ("nudge button");
replace old ArdourButton::Icon API with Gtkmm2ext.
2015-05-24 15:45:39 -04:00
nudge_forward_button.set_icon(ArdourIcon::NudgeRight);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
nudge_backward_button.set_name ("nudge button");
replace old ArdourButton::Icon API with Gtkmm2ext.
2015-05-24 15:45:39 -04:00
nudge_backward_button.set_icon(ArdourIcon::NudgeLeft);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
fade_context_menu.set_name ("ArdourContextMenu");
Fix special handling of 'zoom vertical' scroll wheel modifier key. gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of the modifier key used to adjust track heights in conjunction with the scroll wheel, so that the same track continues to be resized even when it's shrunk to no longer be under the mouse cursor. However, this code assumed that the modifier key for this was <Shift>. Fix it to use the event->state bit corresponding to ScrollZoomVerticalModifier instead, and rename the relevant functions to clarify that it's the 'zoom vertical' modifier key they're dealing with. Partially fixes #5610.
2013-07-23 11:15:23 -04:00
Gtkmm2ext::Keyboard::the_keyboard().ZoomVerticalModifierReleased.connect (sigc::mem_fun (*this, &Editor::zoom_vertical_modifier_released));
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
significant extensions to tranzport support git-svn-id: svn://localhost/trunk/ardour2@446 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-05 21:52:45 -04:00
/* allow external control surfaces/protocols to do various things */
handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 11:18:43 -04:00
ControlProtocol::ZoomToSession.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_session, this), gui_context());
ControlProtocol::ZoomIn.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_step, this, false), gui_context());
ControlProtocol::ZoomOut.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_step, this, true), gui_context());
allow ControlProtocols to call for undo/redo in GUI; make MCP use this git-svn-id: svn://localhost/ardour2/branches/3.0@11851 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 11:50:38 -04:00
ControlProtocol::Undo.connect (*this, invalidator (*this), boost::bind (&Editor::undo, this, true), gui_context());
ControlProtocol::Redo.connect (*this, invalidator (*this), boost::bind (&Editor::redo, this, true), gui_context());
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
ControlProtocol::ScrollTimeline.connect (*this, invalidator (*this), boost::bind (&Editor::control_scroll, this, _1), gui_context());
MCP: lots of good stuff - recenable bug fixed, cursor keys for vertical scroll work, loop button lights/unlightspan pots don't adjust if there is no panner, etc. git-svn-id: svn://localhost/ardour2/branches/3.0@12093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 23:46:18 -04:00
ControlProtocol::StepTracksUp.connect (*this, invalidator (*this), boost::bind (&Editor::control_step_tracks_up, this), gui_context());
ControlProtocol::StepTracksDown.connect (*this, invalidator (*this), boost::bind (&Editor::control_step_tracks_down, this), gui_context());
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
ControlProtocol::GotoView.connect (*this, invalidator (*this), boost::bind (&Editor::control_view, this, _1), gui_context());
MCP: F1-7 jump to a given view; F8 closes any currently open dialog; in zoom mode, up/down alter vertical track height of all tracks; option-up/down alters selected track heights git-svn-id: svn://localhost/ardour2/branches/3.0@11858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 14:53:51 -04:00
ControlProtocol::CloseDialog.connect (*this, invalidator (*this), Keyboard::close_current_dialog, gui_context());
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
ControlProtocol::VerticalZoomInAll.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_in_all, this), gui_context());
ControlProtocol::VerticalZoomOutAll.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_out_all, this), gui_context());
ControlProtocol::VerticalZoomInSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_in_selected, this), gui_context());
ControlProtocol::VerticalZoomOutSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_out_selected, this), gui_context());
MCP: F1-7 jump to a given view; F8 closes any currently open dialog; in zoom mode, up/down alter vertical track height of all tracks; option-up/down alters selected track heights git-svn-id: svn://localhost/ardour2/branches/3.0@11858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 14:53:51 -04:00
many changes associated with rationalizing selection flow
2016-07-06 13:37:30 -04:00
ControlProtocol::AddStripableToSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
ControlProtocol::RemoveStripableFromSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
ControlProtocol::SetStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Set), gui_context());
ControlProtocol::ToggleStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
ControlProtocol::ClearStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_unselect, this), gui_context());
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context());
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
make Escape (cancel drag or selection) work in mixer as well as editor
2016-05-21 08:34:09 -04:00
/* handle escape */
ARDOUR_UI::instance()->Escape.connect (*this, invalidator (*this), boost::bind (&Editor::escape, this), gui_context());
fully implement and deploy explicit x-thread signal connection syntax (testing comes next) git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 13:23:07 -05:00
/* problematic: has to return a value and thus cannot be x-thread */
Session::AskAboutPlaylistDeletion.connect_same_thread (*this, boost::bind (&Editor::playlist_deletion_dialog, this, _1));
Merged with trunk R920. git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-18 23:29:16 -04:00
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&Editor::parameter_changed, this, _1), gui_context());
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &Editor::ui_parameter_changed));
Merged with trunk R992. Completely untested other than it compiles, runs, and records somewhat (need to merge again). git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-10-21 15:01:50 -04:00
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
TimeAxisView::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Editor::timeaxisview_deleted, this, _1), gui_context());
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
_ignore_region_action = false;
Heinous hack to fix region menu sensitivity setup. git-svn-id: svn://localhost/ardour2/branches/3.0@7958 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 22:05:08 -04:00
_last_region_menu_was_main = false;
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
Option to show lines below markers (#3529). git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 13:29:32 -05:00
_show_marker_lines = false;
NO-OP whitespace (updated GH PR #357)
2017-07-01 12:42:24 -04:00
/* Button bindings */
basic adoption of new mouse binding facility git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 22:10:48 -05:00
radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from binding definition We need this because we need binding information/objects before all Actions have been defined.
2015-08-08 08:36:29 -04:00
button_bindings = new Bindings ("editor-mouse");
basic adoption of new mouse binding facility git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 22:10:48 -05:00
XMLNode* node = button_settings();
NO-OP whitespace (updated GH PR #357)
2017-07-01 12:42:24 -04:00
if (node) {
for (XMLNodeList::const_iterator i = node->children().begin(); i != node->children().end(); ++i) {
button_bindings->load_operation (**i);
}
}
basic adoption of new mouse binding facility git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 22:10:48 -05:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
constructed = true;
new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged)
2014-06-30 16:32:38 -04:00
/* grab current parameter state */
boost::function<void (string)> pc (boost::bind (&Editor::ui_parameter_changed, this, _1));
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
UIConfiguration::instance().map_parameters (pc);
Put images on the fade in/out menus. Fixes #3411. git-svn-id: svn://localhost/ardour2/branches/3.0@7805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-18 23:31:03 -04:00
setup_fade_images ();
new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged)
2014-06-30 16:32:38 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
set_grid_to (GridTypeNone);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Editor::~Editor()
{
Fix some Gtk::Menu related memory leaks A Gtk::manage()d widget will be deleted when its parent container is destroyed. Top-level context menus are not inside a container and hence need to be manually deallocated. This adds explicit delete calls for menus where there is a member variable reference to the Menu.
2019-03-07 10:40:16 -05:00
delete tempo_marker_menu;
delete meter_marker_menu;
Cleanup Editor/Marker context-menu This could have caused crashes previously: ::build_range_marker_menu() may have created range_marker_menu while the GUI wanted transport_marker_menu.
2019-03-07 15:24:15 -05:00
delete marker_menu;
delete range_marker_menu;
delete new_transport_marker_menu;
Fix some Gtk::Menu related memory leaks A Gtk::manage()d widget will be deleted when its parent container is destroyed. Top-level context menus are not inside a container and hence need to be manually deallocated. This adds explicit delete calls for menus where there is a member variable reference to the Menu.
2019-03-07 10:40:16 -05:00
delete editor_ruler_menu;
delete _popup_region_menu_item;
the endless quest to plug memory leaks -- episode 379
2016-07-25 11:38:59 -04:00
delete button_bindings;
Split route group list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 14:37:15 -04:00
delete _routes;
delete _route_groups;
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
delete _track_canvas_viewport;
Allow multiple simulataneous Drags to be active, and hence set up and drag time ranges when moving regions in PT-edit mode. git-svn-id: svn://localhost/ardour2/branches/3.0@6478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 11:14:49 -05:00
delete _drags;
fix a bunch of memory leaks
2014-09-10 20:34:09 -04:00
delete nudge_clock;
the endless quest to plug memory leaks -- episode 379
2016-07-25 11:38:59 -04:00
delete _verbose_cursor;
make the quantize dialog persistent so that settings are retained
2015-06-26 12:34:55 -04:00
delete quantize_dialog;
GUI part of memleak fixes
2015-09-12 14:05:46 -04:00
delete _summary;
delete _group_tabs;
delete _regions;
delete _snapshots;
delete _locations;
delete _playlist_selector;
Move selection/punch clocks to editor Sidebar
2016-12-16 20:31:41 -05:00
delete _time_info_box;
Free some one time alloc of the UI (cleaner valgrind output) No incremental leaks here.. * downcase (const char*) uses strdup, caller needs to free * free allocated cursors when the editor is destroyed * drop static editor lua-instance & bindings * delete allocated gtk image/icons
2017-01-20 05:48:59 -05:00
delete selection;
delete cut_buffer;
delete _cursors;
LuaInstance::destroy_instance ();
Clean up selection history in Editor destructor.
2015-11-02 13:25:15 -05:00
for (list<XMLNode *>::iterator i = selection_op_history.begin(); i != selection_op_history.end(); ++i) {
delete *i;
}
Free some one time alloc of the UI (cleaner valgrind output) No incremental leaks here.. * downcase (const char*) uses strdup, caller needs to free * free allocated cursors when the editor is destroyed * drop static editor lua-instance & bindings * delete allocated gtk image/icons
2017-01-20 05:48:59 -05:00
for (std::map<ARDOUR::FadeShape, Gtk::Image*>::const_iterator i = _xfade_in_images.begin(); i != _xfade_in_images.end (); ++i) {
delete i->second;
}
for (std::map<ARDOUR::FadeShape, Gtk::Image*>::const_iterator i = _xfade_out_images.begin(); i != _xfade_out_images.end (); ++i) {
delete i->second;
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
basic adoption of new mouse binding facility git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 22:10:48 -05:00
XMLNode*
Editor::button_settings () const
{
XMLNode* settings = ARDOUR_UI::instance()->editor_settings();
XMLNode* node = find_named_node (*settings, X_("Buttons"));
if (!node) {
node = new XMLNode (X_("Buttons"));
}
return node;
}
Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 14:43:43 -05:00
bool
Editor::get_smart_mode () const
{
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
return ((current_mouse_mode() == MouseObject) && smart_mode_action->get_active());
Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-20 14:43:43 -05:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and associated stuff are now separated (with common things in base classes). Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses all look (and really are) distinct in the GUI. git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 08:03:19 -04:00
Editor::catch_vanishing_regionview (RegionView *rv)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
/* note: the selection will take care of the vanishing
audioregionview by itself.
*/
Allow multiple simulataneous Drags to be active, and hence set up and drag time ranges when moving regions in PT-edit mode. git-svn-id: svn://localhost/ardour2/branches/3.0@6478 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-12 11:14:49 -05:00
if (_drags->active() && _drags->have_item (rv->get_canvas_group()) && !_drags->ending()) {
_drags->abort ();
Fix #2559; crash when doing end_grab on an already-deleted canvas item. git-svn-id: svn://localhost/ardour2/branches/3.0@4709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-27 20:52:45 -05:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
if (clicked_regionview == rv) {
clicked_regionview = 0;
}
if (entered_regionview == rv) {
set_entered_regionview (0);
}
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
if (!_all_region_actions_sensitized) {
sensitize_all_region_actions (true);
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and associated stuff are now separated (with common things in base classes). Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses all look (and really are) distinct in the GUI. git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 08:03:19 -04:00
Editor::set_entered_regionview (RegionView* rv)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
if (rv == entered_regionview) {
return;
}
if (entered_regionview) {
entered_regionview->exited ();
}
a whole slew of changes related to centralizing and rationalizing cursor management. Debugging output left in place to help address the reports that will come in as people test this more
2014-06-18 10:24:59 -04:00
entered_regionview = rv;
if (entered_regionview != 0) {
Remove internal edit mode and add "content" tool.
2014-12-08 23:00:00 -05:00
entered_regionview->entered ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
Heinous hack to fix region menu sensitivity setup. git-svn-id: svn://localhost/ardour2/branches/3.0@7958 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 22:05:08 -04:00
if (!_all_region_actions_sensitized && _last_region_menu_was_main) {
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
/* This RegionView entry might have changed what region actions
are allowed, so sensitize them all in case a key is pressed.
*/
sensitize_all_region_actions (true);
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::set_entered_track (TimeAxisView* tav)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
if (entered_track) {
entered_track->exited ();
}
a whole slew of changes related to centralizing and rationalizing cursor management. Debugging output left in place to help address the reports that will come in as people test this more
2014-06-18 10:24:59 -04:00
entered_track = tav;
if (entered_track) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
entered_track->entered ();
}
}
void
Editor::instant_save ()
{
Fix editor sizing issue introduced in 4dc65e66 Previously Editor::instant_save() returned if no session was loaded, effectively Config->add_instant_xml(get_state()); was never called. instant save() is called early on, in Editor's c'tor before the editor is realized and saves invalid window-size and window-state, which are used later.
2018-12-06 21:36:48 -05:00
if (!constructed || !_session || no_save_instant) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
return;
}
Fix editor sizing issue introduced in 4dc65e66 Previously Editor::instant_save() returned if no session was loaded, effectively Config->add_instant_xml(get_state()); was never called. instant save() is called early on, in Editor's c'tor before the editor is realized and saves invalid window-size and window-state, which are used later.
2018-12-06 21:36:48 -05:00
_session->add_instant_xml(get_state());
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
MCP: F1-7 jump to a given view; F8 closes any currently open dialog; in zoom mode, up/down alter vertical track height of all tracks; option-up/down alters selected track heights git-svn-id: svn://localhost/ardour2/branches/3.0@11858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 14:53:51 -04:00
void
Editor::control_vertical_zoom_in_all ()
{
tav_zoom_smooth (false, true);
}
void
Editor::control_vertical_zoom_out_all ()
{
tav_zoom_smooth (true, true);
}
void
Editor::control_vertical_zoom_in_selected ()
{
tav_zoom_smooth (false, false);
}
void
Editor::control_vertical_zoom_out_selected ()
{
tav_zoom_smooth (true, false);
}
void
Editor::control_view (uint32_t view)
{
goto_visual_state (view);
}
MCP: different meter debug trace; initial support for track selection git-svn-id: svn://localhost/ardour2/branches/3.0@11852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 12:15:55 -04:00
void
Editor::control_unselect ()
{
selection->clear_tracks ();
}
many changes associated with rationalizing selection flow
2016-07-06 13:37:30 -04:00
void
Editor::control_select (boost::shared_ptr<Stripable> s, Selection::Operation op)
{
use CoreSelection for track selection
2017-05-05 07:31:49 -04:00
TimeAxisView* tav = time_axis_view_from_stripable (s);
many changes associated with rationalizing selection flow
2016-07-06 13:37:30 -04:00
if (tav) {
switch (op) {
case Selection::Add:
selection->add (tav);
break;
case Selection::Toggle:
selection->toggle (tav);
break;
case Selection::Extend:
break;
case Selection::Set:
selection->set (tav);
break;
}
} else {
selection->clear_tracks ();
}
}
MCP: lots of good stuff - recenable bug fixed, cursor keys for vertical scroll work, loop button lights/unlightspan pots don't adjust if there is no panner, etc. git-svn-id: svn://localhost/ardour2/branches/3.0@12093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 23:46:18 -04:00
void
Editor::control_step_tracks_up ()
{
scroll_tracks_up_line ();
}
void
Editor::control_step_tracks_down ()
{
scroll_tracks_down_line ();
}
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
void
Editor::control_scroll (float fraction)
{
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
ENSURE_GUI_THREAD (*this, &Editor::control_scroll, fraction)
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (!_session) {
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
return;
}
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
2013-04-12 11:21:12 -04:00
double step = fraction * current_page_samples();
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
/*
_control_scroll_target is an optional<T>
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
it acts like a pointer to an samplepos_t, with
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
a operator conversion to boolean to check
that it has a value could possibly use
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
playhead_cursor->current_sample to store the
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
value and a boolean in the class to know
when it's out of date
*/
if (!_control_scroll_target) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
_control_scroll_target = _session->transport_sample();
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
_dragging_playhead = true;
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if ((fraction < 0.0f) && (*_control_scroll_target <= (samplepos_t) fabs(step))) {
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
*_control_scroll_target = 0;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
} else if ((fraction > 0.0f) && (max_samplepos - *_control_scroll_target < step)) {
*_control_scroll_target = max_samplepos - (current_page_samples()*2); // allow room for slop in where the PH is on the screen
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
} else {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
*_control_scroll_target += (samplepos_t) trunc (step);
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
}
/* move visuals, we'll catch up with it later */
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
playhead_cursor->set_position (*_control_scroll_target);
UpdateAllTransportClocks (*_control_scroll_target);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
2013-04-12 11:21:12 -04:00
if (*_control_scroll_target > (current_page_samples() / 2)) {
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
/* try to center PH in window */
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
2013-04-12 11:21:12 -04:00
reset_x_origin (*_control_scroll_target - (current_page_samples()/2));
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
} else {
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
reset_x_origin (0);
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
}
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
/*
Now we do a timeout to actually bring the session to the right place
according to the playhead. This is to avoid reading disk buffers on every
call to control_scroll, which is driven by ScrollTimeline and therefore
probably by a control surface wheel which can generate lots of events.
*/
/* cancel the existing timeout */
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
control_scroll_connection.disconnect ();
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
/* add the next timeout */
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
control_scroll_connection = Glib::signal_timeout().connect (sigc::bind (sigc::mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250);
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
}
bool
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::deferred_control_scroll (samplepos_t /*target*/)
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
{
rename DoTheRightThing to RollIfAppropriate
2020-01-17 18:35:28 -05:00
_session->request_locate (*_control_scroll_target, RollIfAppropriate);
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* reset for next stream */
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
_control_scroll_target = boost::none;
_dragging_playhead = false;
3 different data wheel modes for tranzport, plus lock on writes, and more git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-04-06 12:51:27 -04:00
return false;
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
void
Add Lua bindings to set toggle-actions
2017-08-09 08:04:05 -04:00
Editor::access_action (const std::string& action_group, const std::string& action_item)
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (!_session) {
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
return;
}
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
ENSURE_GUI_THREAD (*this, &Editor::access_action, action_group, action_item)
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
RefPtr<Action> act;
Add an exception handler for access_action() used by control surfaces and Lua.
2019-03-19 12:52:19 -04:00
try {
act = ActionManager::get_action (action_group.c_str(), action_item.c_str());
if (act) {
act->activate();
}
} catch ( ActionManager::MissingActionException const& e) {
cerr << "MissingActionException:" << e.what () << endl;
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
}
Add Lua bindings to set toggle-actions
2017-08-09 08:04:05 -04:00
void
Editor::set_toggleaction (const std::string& action_group, const std::string& action_item, bool s)
{
ActionManager::set_toggleaction_state (action_group.c_str(), action_item.c_str(), s);
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
fix all _impl member functions to be on_ instead git-svn-id: svn://localhost/trunk/ardour2@38 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 22:48:59 -04:00
Editor::on_realize ()
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
button hacks and more git-svn-id: svn://localhost/trunk/ardour2@200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-21 16:37:18 -05:00
Realized ();
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
if (UIConfiguration::instance().get_lock_gui_after_seconds()) {
add UIConfig variable for lock timer
2014-06-25 11:34:37 -04:00
start_lock_event_timing ();
}
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
}
void
Editor::start_lock_event_timing ()
{
/* check if we should lock the GUI every 30 seconds */
Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::lock_timeout_callback), 30 * 1000);
}
bool
Editor::generic_event_handler (GdkEvent* ev)
{
switch (ev->type) {
case GDK_BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
case GDK_MOTION_NOTIFY:
case GDK_KEY_PRESS:
case GDK_KEY_RELEASE:
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
if (contents().is_mapped()) {
gettimeofday (&last_event_time, 0);
}
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
break;
set the CairoWidget focus handler; reset focus when the mouse pointer leaves the Editor window
2014-09-16 12:46:39 -04:00
case GDK_LEAVE_NOTIFY:
switch (ev->crossing.detail) {
case GDK_NOTIFY_UNKNOWN:
case GDK_NOTIFY_INFERIOR:
case GDK_NOTIFY_ANCESTOR:
globally remove all trailing whitespace from ardour code base. Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
break;
set the CairoWidget focus handler; reset focus when the mouse pointer leaves the Editor window
2014-09-16 12:46:39 -04:00
case GDK_NOTIFY_VIRTUAL:
case GDK_NOTIFY_NONLINEAR:
case GDK_NOTIFY_NONLINEAR_VIRTUAL:
/* leaving window, so reset focus, thus ending any and
all text entry operations.
*/
use moved version of reset_focus()
2016-09-06 16:17:39 -04:00
ARDOUR_UI::instance()->reset_focus (&contents());
set the CairoWidget focus handler; reset focus when the mouse pointer leaves the Editor window
2014-09-16 12:46:39 -04:00
break;
}
break;
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
default:
break;
}
set the CairoWidget focus handler; reset focus when the mouse pointer leaves the Editor window
2014-09-16 12:46:39 -04:00
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
return false;
}
bool
Editor::lock_timeout_callback ()
{
struct timeval now, delta;
gettimeofday (&now, 0);
timersub (&now, &last_event_time, &delta);
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
if (delta.tv_sec > (time_t) UIConfiguration::instance().get_lock_gui_after_seconds()) {
new timer-based GUI locking code
2014-06-25 08:28:36 -04:00
lock ();
/* don't call again. Returning false will effectively
disconnect us from the timer callback.
unlock() will call start_lock_event_timing() to get things
started again.
*/
return false;
}
return true;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::map_position_change (samplepos_t sample)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
ENSURE_GUI_THREAD (*this, &Editor::map_position_change, sample)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Fix playhead behaviour on auto-return if follow playhead is not set. git-svn-id: svn://localhost/ardour2/branches/3.0@7398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 20:58:20 -04:00
if (_session == 0) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
return;
}
Fix playhead behaviour on auto-return if follow playhead is not set. git-svn-id: svn://localhost/ardour2/branches/3.0@7398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 20:58:20 -04:00
if (_follow_playhead) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
center_screen (sample);
Fix playhead behaviour on auto-return if follow playhead is not set. git-svn-id: svn://localhost/ardour2/branches/3.0@7398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-08 20:58:20 -04:00
}
Prevent updates to the playhead when a locate is pending after a drag/click is used to move the playhead. There are two problem cases: 1) the drag "fake-located" the playhead, but a redraw happens before the locate itself finishes. 2) the transport emits Session::PositionChanged from Session::non_realtime_stop(), even though this is occuring in the "middle" of the locate process (we stop first). In the first case, the drag code sets _pending_locate_request, since we need this to be true even before the queued SessionEvent for the locate has been processed. So to deal with this case In the second case, we use Session::locate_initiated() to decide if we're in the middle of a locate.
2020-03-25 20:35:28 -04:00
if (!_session->locate_initiated()) {
playhead_cursor->set_position (sample);
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::center_screen (samplepos_t sample)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplecnt_t const page = _visible_canvas_width * samples_per_pixel;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
/* if we're off the page, then scroll.
*/
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (sample < _leftmost_sample || sample >= _leftmost_sample + page) {
center_screen_internal (sample, page);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::center_screen_internal (samplepos_t sample, float page)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
page /= 2;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (sample > page) {
sample -= (samplepos_t) page;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
} else {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
sample = 0;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
reset_x_origin (sample);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
Editor::update_title ()
{
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
ENSURE_GUI_THREAD (*this, &Editor::update_title);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
if (!own_window()) {
return;
}
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session) {
bool dirty = _session->dirty();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merged with trunk R1622. git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 03:07:38 -04:00
string session_name;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session->snap_name() != _session->name()) {
session_name = _session->snap_name();
Merged with trunk R1622. git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 03:07:38 -04:00
} else {
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
session_name = _session->name();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
if (dirty) {
Merged with trunk R1622. git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 03:07:38 -04:00
session_name = "*" + session_name;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Merged with trunk R1622. git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 03:07:38 -04:00
WindowTitle title(session_name);
add "Editor" to detached editor window name to see if this fixes Unity WM behaviour
2015-11-16 13:06:20 -05:00
title += S_("Window|Editor");
Merged with trunk R1622. git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 03:07:38 -04:00
title += Glib::get_application_name();
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
own_window()->set_title (title.get_string());
break out of step editing if a session goes away; do nothing in Editor::located() if the session has gone away git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 11:19:58 -04:00
} else {
/* ::session_going_away() will have taken care of it */
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
void
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
Editor::set_session (Session *t)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
SessionHandlePtr::set_session (t);
fix deadlock in protocol manager startup; fix some other ::set_session() SNAFUs; remove last boost::signals2::connection member from libardour git-svn-id: svn://localhost/ardour2/branches/3.0@6375 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:36:52 -05:00
if (!_session) {
return;
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* initialize _leftmost_sample to the extents of the session
* this prevents a bogus setting of leftmost = "0" if the summary view asks for the leftmost sample
* before the visible state has been loaded from instant.xml */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
_leftmost_sample = session_gui_extents().first;
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_playlist_selector->set_session (_session);
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 13:50:37 -04:00
nudge_clock->set_session (_session);
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_summary->set_session (_session);
_group_tabs->set_session (_session);
_route_groups->set_session (_session);
_regions->set_session (_session);
(Source List) Source property signals (gtk2 part) See: https://docs.google.com/document/d/1sI7p9RoRVZtNx2n67RvBa0_16fuZblV_lNkkKN2g93s/edit?usp=sharing
2018-11-15 10:21:55 -05:00
_sources->set_session (_session);
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_snapshots->set_session (_session);
_routes->set_session (_session);
_locations->set_session (_session);
Move selection/punch clocks to editor Sidebar
2016-12-16 20:31:41 -05:00
_time_info_box->set_session (_session);
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (rhythm_ferret) {
rhythm_ferret->set_session (_session);
}
if (analysis_window) {
analysis_window->set_session (_session);
}
if (sfbrowser) {
sfbrowser->set_session (_session);
}
Set up rulers to prevent access to uninitialized variables later. git-svn-id: svn://localhost/ardour2/branches/3.0@5025 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-01 16:30:22 -04:00
compute_fixed_ruler_scale ();
Save marker selection state in instant.xml (#4203). git-svn-id: svn://localhost/ardour2/branches/3.0@10245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 20:05:31 -04:00
/* Make sure we have auto loop and auto punch ranges */
Location* loc = _session->locations()->auto_loop_location();
various work to make loop/punch display work better (including fixes for bugs present in master also)
2014-01-27 21:27:13 -05:00
if (loc != 0) {
Save marker selection state in instant.xml (#4203). git-svn-id: svn://localhost/ardour2/branches/3.0@10245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 20:05:31 -04:00
loc->set_name (_("Loop"));
}
loc = _session->locations()->auto_punch_location();
various work to make loop/punch display work better (including fixes for bugs present in master also)
2014-01-27 21:27:13 -05:00
if (loc != 0) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* force name */
Save marker selection state in instant.xml (#4203). git-svn-id: svn://localhost/ardour2/branches/3.0@10245 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-19 20:05:31 -04:00
loc->set_name (_("Punch"));
}
refresh_location_display ();
/* This must happen after refresh_location_display(), as (amongst other things) we restore
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
* the selected Marker; this needs the LocationMarker list to be available.
*/
Merged with trunk R1304 git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 14:50:49 -05:00
XMLNode* node = ARDOUR_UI::instance()->editor_settings();
rework Stateful::set_state() patch to avoid default version argument git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-15 14:56:11 -04:00
set_state (*node, Stateful::loading_state_version);
Merged with trunk R1304 git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 14:50:49 -05:00
use CoreSelection for track selection
2017-05-05 07:31:49 -04:00
/* catch up on selection state, etc. */
PropertyChange sc;
sc.add (Properties::selected);
presentation_info_changed (sc);
Merged with trunk R1304 git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 14:50:49 -05:00
/* catch up with the playhead */
include a LocateTransportDisposition argument when Editor initially locates Not clear if the editor really needs to make this call at all
2020-01-20 13:14:28 -05:00
_session->request_locate (playhead_cursor->current_sample (), MustStop);
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
_pending_initial_locate = true;
Merged with trunk R1304 git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 14:50:49 -05:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
update_title ();
/* These signals can all be emitted by a non-GUI thread. Therefore the
handlers for them must not attempt to directly interact with the GUI,
major redesign of MIDI port heirarchy and management (part 2)
2013-08-07 22:22:11 -04:00
but use PBD::Signal<T>::connect() which accepts an event loop
("context") where the handler will be asked to run.
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
*/
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
_session->StepEditStatusChange.connect (_session_connections, invalidator (*this), boost::bind (&Editor::step_edit_status_change, this, _1), gui_context());
handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 11:18:43 -04:00
_session->TransportStateChange.connect (_session_connections, invalidator (*this), boost::bind (&Editor::map_transport_state, this), gui_context());
Reset Playhead interpolation when looping and locating
2017-03-31 08:11:49 -04:00
_session->TransportLooped.connect (_session_connections, invalidator (*this), boost::bind (&Editor::transport_looped, this), gui_context());
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
_session->PositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::map_position_change, this, _1), gui_context());
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
_session->vca_manager().VCAAdded.connect (_session_connections, invalidator (*this), boost::bind (&Editor::add_vcas, this, _1), gui_context());
first pass at the big rethink of managing sort order keys for editor and mixer. this appears to work, but remote control IDs are not yet correct (frequently off by one because of the presence of the master bus in the editor) git-svn-id: svn://localhost/ardour2/branches/3.0@12953 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-27 18:57:06 -04:00
_session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&Editor::add_routes, this, _1), gui_context());
handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 11:18:43 -04:00
_session->DirtyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::update_title, this), gui_context());
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
_session->tempo_map().PropertyChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::tempo_map_changed, this, _1), gui_context());
mark session dirty when dragging tempo markers.
2017-01-26 11:05:32 -05:00
_session->tempo_map().MetricPositionChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::tempometric_position_changed, this, _1), gui_context());
handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 11:18:43 -04:00
_session->Located.connect (_session_connections, invalidator (*this), boost::bind (&Editor::located, this), gui_context());
remove the apparently unnecessary "ui_bind()" macro from entire source base git-svn-id: svn://localhost/ardour2/branches/3.0@12088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-25 08:58:19 -04:00
_session->config.ParameterChanged.connect (_session_connections, invalidator (*this), boost::bind (&Editor::parameter_changed, this, _1), gui_context());
_session->StateSaved.connect (_session_connections, invalidator (*this), boost::bind (&Editor::session_state_saved, this, _1), gui_context());
_session->locations()->added.connect (_session_connections, invalidator (*this), boost::bind (&Editor::add_new_location, this, _1), gui_context());
_session->locations()->removed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::location_gone, this, _1), gui_context());
handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big) git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 11:18:43 -04:00
_session->locations()->changed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::refresh_location_display, this), gui_context());
_session->history().Changed.connect (_session_connections, invalidator (*this), boost::bind (&Editor::history_changed, this), gui_context());
Merged with trunk R920. git-svn-id: svn://localhost/ardour2/branches/midi@921 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-09-18 23:29:16 -04:00
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
playhead_cursor->track_canvas_item().reparent ((ArdourCanvas::Item*) get_cursor_scroll_group());
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
playhead_cursor->show ();
Don't defer Editor::track_canvas_size_allocated () (defer the timebar redrawing instead) + some performance improvements to said function, fix puzzling ineffective thinko wrt region movement, show/hide playhead more sensibly. git-svn-id: svn://localhost/ardour2/branches/3.0@3771 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-20 05:06:49 -04:00
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
snapped_cursor->track_canvas_item().reparent ((ArdourCanvas::Item*) get_cursor_scroll_group());
snapped_cursor->set_color (UIConfiguration::instance().color ("edit point"));
snapped_cursor->show ();
remove using namespace sigc everywhere to ensure clarity over which bind/mem_fun is being used; make Config::map_parameters take a boost::function rather than a sigc::slot ; continue debugging crash caused by regionviews not tracking their Region's lifetime git-svn-id: svn://localhost/ardour2/branches/3.0@6357 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-12 10:02:15 -05:00
boost::function<void (string)> pc (boost::bind (&Editor::parameter_changed, this, _1));
Config->map_parameters (pc);
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_session->config.map_parameters (pc);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
restore_ruler_visibility ();
the Properties & 64bit region commit git-svn-id: svn://localhost/ardour2/branches/3.0@6695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-18 08:59:49 -05:00
//tempo_map_changed (PropertyChange (0));
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
change frames_per_pixel to samples_per_pixel
2013-04-12 11:31:50 -04:00
(static_cast<TimeAxisView*>(*i))->set_samples_per_pixel (samples_per_pixel);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Move Timers/Timeouts from ARDOUR_UI into functions in timers.h and use PBD::Timers
2014-12-25 10:02:00 -05:00
super_rapid_screen_update_connection = Timers::super_rapid_connect (
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
sigc::mem_fun (*this, &Editor::super_rapid_screen_update)
);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Merge with 2.0-ongoing R3082. Superficial generification of export stuff. git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 17:10:27 -05:00
/* register for undo history */
make Stateful::_id private and provide appropriate methods to set it, and use them throughout ardour git-svn-id: svn://localhost/ardour2/branches/3.0@10222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 09:18:47 -04:00
_session->register_with_memento_command_factory(id(), this);
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
_session->register_with_memento_command_factory(_selection_memento->id(), _selection_memento);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Editor Actions Scripts & Manager
2016-02-23 09:42:53 -05:00
LuaInstance::instance()->set_session(_session);
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
start_updating_meters ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
incorrect but visible context menu for xfades git-svn-id: svn://localhost/ardour2/branches/3.0@12243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-10 15:14:11 -04:00
void
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
Editor::fill_xfade_menu (Menu_Helpers::MenuList& items, bool start)
incorrect but visible context menu for xfades git-svn-id: svn://localhost/ardour2/branches/3.0@12243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-10 15:14:11 -04:00
{
using namespace Menu_Helpers;
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
void (Editor::*emf)(FadeShape);
std::map<ARDOUR::FadeShape,Gtk::Image*>* images;
if (start) {
images = &_xfade_in_images;
emf = &Editor::set_fade_in_shape;
} else {
images = &_xfade_out_images;
emf = &Editor::set_fade_out_shape;
}
items.push_back (
ImageMenuElem (
_("Linear (for highly correlated material)"),
*(*images)[FadeLinear],
sigc::bind (sigc::mem_fun (*this, emf), FadeLinear)
)
);
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
items.push_back (
ImageMenuElem (
14:03 < prokoudine> "GERMAN SCIENTIST DEMYSTIFIED ENGLISH CAPITALIZATION" git-svn-id: svn://localhost/ardour2/branches/3.0@13789 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-05 09:07:00 -05:00
_("Constant power"),
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
*(*images)[FadeConstantPower],
sigc::bind (sigc::mem_fun (*this, emf), FadeConstantPower)
));
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
items.push_back (
ImageMenuElem (
_("Symmetric"),
*(*images)[FadeSymmetric],
sigc::bind (sigc::mem_fun (*this, emf), FadeSymmetric)
)
);
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
items.push_back (
ImageMenuElem (
_("Slow"),
*(*images)[FadeSlow],
sigc::bind (sigc::mem_fun (*this, emf), FadeSlow)
));
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
items.push_back (
ImageMenuElem (
_("Fast"),
*(*images)[FadeFast],
sigc::bind (sigc::mem_fun (*this, emf), FadeFast)
));
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
dynamic_cast<ImageMenuItem*>(&items.back())->set_always_show_image ();
}
/** Pop up a context menu for when the user clicks on a start crossfade */
void
update x-fade context-menu
2014-05-29 01:49:26 -04:00
Editor::popup_xfade_in_context_menu (int button, int32_t time, ArdourCanvas::Item* item, ItemType /*item_type*/)
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
{
using namespace Menu_Helpers;
Fix potential crash when right clicks go astray. This should be impossible, since nothing but an audio region should have a fade to begin with, but just doing nothing in this case does no harm.
2014-12-17 03:06:23 -05:00
AudioRegionView* arv = dynamic_cast<AudioRegionView*> ((RegionView*)item->get_data ("regionview"));
if (!arv) {
return;
}
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
MenuList& items (xfade_in_context_menu.items());
update x-fade context-menu
2014-05-29 01:49:26 -04:00
items.clear ();
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
update x-fade context-menu
2014-05-29 01:49:26 -04:00
if (arv->audio_region()->fade_in_active()) {
items.push_back (MenuElem (_("Deactivate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_active), false)));
} else {
items.push_back (MenuElem (_("Activate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_in_active), true)));
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
}
update x-fade context-menu
2014-05-29 01:49:26 -04:00
items.push_back (SeparatorElem());
fill_xfade_menu (items, true);
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
xfade_in_context_menu.popup (button, time);
}
/** Pop up a context menu for when the user clicks on an end crossfade */
void
update x-fade context-menu
2014-05-29 01:49:26 -04:00
Editor::popup_xfade_out_context_menu (int button, int32_t time, ArdourCanvas::Item* item, ItemType /*item_type*/)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
using namespace Menu_Helpers;
Fix potential crash when right clicks go astray. This should be impossible, since nothing but an audio region should have a fade to begin with, but just doing nothing in this case does no harm.
2014-12-17 03:06:23 -05:00
AudioRegionView* arv = dynamic_cast<AudioRegionView*> ((RegionView*)item->get_data ("regionview"));
if (!arv) {
return;
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
update x-fade context-menu
2014-05-29 01:49:26 -04:00
MenuList& items (xfade_out_context_menu.items());
fix bork-age of the fade in/out context menu introduced by mistake yesterday git-svn-id: svn://localhost/ardour2/branches/3.0@12311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 10:20:12 -04:00
items.clear ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
update x-fade context-menu
2014-05-29 01:49:26 -04:00
if (arv->audio_region()->fade_out_active()) {
items.push_back (MenuElem (_("Deactivate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_active), false)));
} else {
items.push_back (MenuElem (_("Activate"), sigc::bind (sigc::mem_fun (*this, &Editor::set_fade_out_active), true)));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
update x-fade context-menu
2014-05-29 01:49:26 -04:00
items.push_back (SeparatorElem());
fill_xfade_menu (items, false);
xfade_out_context_menu.popup (button, time);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
Use the edit position to decide what items to put in the region context menus, rather than the mouse position. git-svn-id: svn://localhost/ardour2/branches/3.0@8028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:59 -05:00
Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
using namespace Menu_Helpers;
Use the edit position to decide what items to put in the region context menus, rather than the mouse position. git-svn-id: svn://localhost/ardour2/branches/3.0@8028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:59 -05:00
Menu* (Editor::*build_menu_function)();
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Menu *menu;
switch (item_type) {
case RegionItem:
case RegionViewName:
case RegionViewNameHighlight:
add left/right side trim cursors and use them for region trimming, as appropriate git-svn-id: svn://localhost/ardour2/branches/3.0@7268 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-17 08:45:51 -04:00
case LeftFrameHandle:
case RightFrameHandle:
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
if (with_selection) {
build_menu_function = &Editor::build_track_selection_context_menu;
} else {
build_menu_function = &Editor::build_track_region_context_menu;
}
break;
case SelectionItem:
if (with_selection) {
build_menu_function = &Editor::build_track_selection_context_menu;
} else {
build_menu_function = &Editor::build_track_context_menu;
}
break;
case StreamItem:
Fix odd right click crash on master track. To reproduce. Launch, right click in ruler area then drag down until over the master track and let go. #0 0x0000555555ba1d44 in boost::shared_ptr<ARDOUR::Route>::get() const (this=0x8) at /usr/include/boost/smart_ptr/shared_ptr.hpp:748 #1 0x0000555555ba0a2f in boost::dynamic_pointer_cast<ARDOUR::Track, ARDOUR::Route>(boost::shared_ptr<ARDOUR::Route> const&) (r=...) at /usr/include/boost/smart_ptr/shared_ptr.hpp:904 #2 0x000055555650b92b in RouteUI::track() const (this=0x0) at ../gtk2_ardour/route_ui.cc:1885 #3 0x0000555555d0b92f in Editor::popup_track_context_menu(int, int, ItemType, bool) (this= 0x555557a3efd0, button=1, time=600214966, item_type=StreamItem, with_selection=false) at ../gtk2_ardour/editor.cc:1595 #4 0x0000555555e1a4cf in Editor::button_release_handler(ArdourCanvas::Item*, _GdkEvent*, ItemType) (this=0x555557a3efd0, item= 0x555557b2fe00, event=0x7fffffffc310, item_type=StreamItem) at ../gtk2_ardour/editor_mouse.cc:1543 ....
2020-03-03 14:49:04 -05:00
if (clicked_routeview != 0 && clicked_routeview->track()) {
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
build_menu_function = &Editor::build_track_context_menu;
} else {
build_menu_function = &Editor::build_track_bus_context_menu;
}
break;
default:
/* probably shouldn't happen but if it does, we don't care */
return;
}
Use the edit position to decide what items to put in the region context menus, rather than the mouse position. git-svn-id: svn://localhost/ardour2/branches/3.0@8028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:59 -05:00
menu = (this->*build_menu_function)();
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
/* now handle specific situations */
switch (item_type) {
case RegionItem:
case RegionViewName:
case RegionViewNameHighlight:
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
case LeftFrameHandle:
case RightFrameHandle:
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
break;
case SelectionItem:
break;
case StreamItem:
break;
default:
/* probably shouldn't happen but if it does, we don't care */
return;
}
if (item_type != SelectionItem && clicked_routeview && clicked_routeview->audio_track()) {
/* Bounce to disk */
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
using namespace Menu_Helpers;
MenuList& edit_items = menu->items();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (SeparatorElem());
switch (clicked_routeview->audio_track()->freeze_state()) {
case AudioTrack::NoFreeze:
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Freeze"), sigc::mem_fun(*this, &Editor::freeze_route)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
break;
case AudioTrack::Frozen:
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Unfreeze"), sigc::mem_fun(*this, &Editor::unfreeze_route)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
break;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
case AudioTrack::UnFrozen:
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Freeze"), sigc::mem_fun(*this, &Editor::freeze_route)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
break;
}
}
Committed underlay support (from Audun). git-svn-id: svn://localhost/ardour2/branches/3.0@3037 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-10 13:16:25 -05:00
if (item_type == StreamItem && clicked_routeview) {
clicked_routeview->build_underlay_menu(menu);
}
Heinous hack to fix region menu sensitivity setup. git-svn-id: svn://localhost/ardour2/branches/3.0@7958 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 22:05:08 -04:00
/* When the region menu is opened, we setup the actions so that they look right
in the menu.
*/
simplify arguments to Editor::sensitize_the_right_region_actions()
2017-02-15 13:50:51 -05:00
sensitize_the_right_region_actions (false);
Heinous hack to fix region menu sensitivity setup. git-svn-id: svn://localhost/ardour2/branches/3.0@7958 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 22:05:08 -04:00
_last_region_menu_was_main = false;
menu->signal_hide().connect (sigc::bind (sigc::mem_fun (*this, &Editor::sensitize_all_region_actions), true));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
menu->popup (button, time);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Menu*
Use the edit position to decide what items to put in the region context menus, rather than the mouse position. git-svn-id: svn://localhost/ardour2/branches/3.0@8028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:59 -05:00
Editor::build_track_context_menu ()
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
using namespace Menu_Helpers;
use new paned-sizing strategy in editor
2016-04-22 23:02:39 -04:00
MenuList& edit_items = track_context_menu.items();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
edit_items.clear();
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
add_dstream_context_items (edit_items);
return &track_context_menu;
}
Menu*
Use the edit position to decide what items to put in the region context menus, rather than the mouse position. git-svn-id: svn://localhost/ardour2/branches/3.0@8028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:59 -05:00
Editor::build_track_bus_context_menu ()
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
{
using namespace Menu_Helpers;
use new paned-sizing strategy in editor
2016-04-22 23:02:39 -04:00
MenuList& edit_items = track_context_menu.items();
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.clear();
add_bus_context_items (edit_items);
return &track_context_menu;
}
Menu*
Use the edit position to decide what items to put in the region context menus, rather than the mouse position. git-svn-id: svn://localhost/ardour2/branches/3.0@8028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:59 -05:00
Editor::build_track_region_context_menu ()
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
{
using namespace Menu_Helpers;
MenuList& edit_items = track_region_context_menu.items();
edit_items.clear();
Fix some segfaults on right-clicking a region. git-svn-id: svn://localhost/ardour2/branches/3.0@7439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-18 21:43:11 -04:00
/* we've just cleared the track region context menu, so the menu that these
two items were on will have disappeared; stop them dangling.
*/
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
if (rtv) {
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
boost::shared_ptr<Track> tr;
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
boost::shared_ptr<Playlist> pl;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Decide whether to show crossfade and choose-top-region menus based on the mouse position rather than the edit point. I think this is marginally more intuitive. git-svn-id: svn://localhost/ardour2/branches/3.0@8980 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-27 11:43:48 -05:00
if ((tr = rtv->track())) {
add_region_context_items (edit_items, tr);
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
}
}
add_dstream_context_items (edit_items);
return &track_region_context_menu;
}
First commit on FFT analysis window. Still some functionality missing, but it's mostly done. git-svn-id: svn://localhost/trunk/ardour2@383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 16:58:52 -05:00
void
add region & range loudnless report
2016-03-11 11:26:27 -05:00
Editor::loudness_analyze_region_selection ()
{
if (!_session) {
return;
}
Selection& s (PublicEditor::instance ().get_selection ());
RegionSelection ars = s.regions;
ARDOUR::AnalysisGraph ag (_session);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplecnt_t total_work = 0;
add region & range loudnless report
2016-03-11 11:26:27 -05:00
for (RegionSelection::iterator j = ars.begin (); j != ars.end (); ++j) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*j);
if (!arv) {
continue;
}
if (!boost::dynamic_pointer_cast<AudioRegion> (arv->region ())) {
continue;
}
assert (dynamic_cast<RouteTimeAxisView *> (&arv->get_time_axis_view ()));
total_work += arv->region ()->length ();
}
SimpleProgressDialog spd (_("Region Loudness Analysis"), sigc::mem_fun (ag, &AnalysisGraph::cancel));
ScopedConnection c;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
ag.set_total_samples (total_work);
add region & range loudnless report
2016-03-11 11:26:27 -05:00
ag.Progress.connect_same_thread (c, boost::bind (&SimpleProgressDialog::update_progress, &spd, _1, _2));
spd.show();
for (RegionSelection::iterator j = ars.begin (); j != ars.end (); ++j) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*j);
if (!arv) {
continue;
}
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (arv->region ());
if (!ar) {
continue;
}
ag.analyze_region (ar);
}
spd.hide();
if (!ag.canceled ()) {
ExportReport er (_("Audio Report/Analysis"), ag.results ());
er.run();
}
}
void
Editor::loudness_analyze_range_selection ()
{
if (!_session) {
return;
}
Selection& s (PublicEditor::instance ().get_selection ());
TimeSelection ts = s.time;
ARDOUR::AnalysisGraph ag (_session);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplecnt_t total_work = 0;
add region & range loudnless report
2016-03-11 11:26:27 -05:00
for (TrackSelection::iterator i = s.tracks.begin (); i != s.tracks.end (); ++i) {
boost::shared_ptr<AudioPlaylist> pl = boost::dynamic_pointer_cast<AudioPlaylist> ((*i)->playlist ());
if (!pl) {
continue;
}
RouteUI *rui = dynamic_cast<RouteUI *> (*i);
if (!pl || !rui) {
continue;
}
for (std::list<AudioRange>::iterator j = ts.begin (); j != ts.end (); ++j) {
total_work += j->length ();
}
}
SimpleProgressDialog spd (_("Range Loudness Analysis"), sigc::mem_fun (ag, &AnalysisGraph::cancel));
ScopedConnection c;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
ag.set_total_samples (total_work);
add region & range loudnless report
2016-03-11 11:26:27 -05:00
ag.Progress.connect_same_thread (c, boost::bind (&SimpleProgressDialog::update_progress, &spd, _1, _2));
spd.show();
for (TrackSelection::iterator i = s.tracks.begin (); i != s.tracks.end (); ++i) {
boost::shared_ptr<AudioPlaylist> pl = boost::dynamic_pointer_cast<AudioPlaylist> ((*i)->playlist ());
if (!pl) {
continue;
}
RouteUI *rui = dynamic_cast<RouteUI *> (*i);
if (!pl || !rui) {
continue;
}
ag.analyze_range (rui->route (), pl, ts);
}
spd.hide();
if (!ag.canceled ()) {
ExportReport er (_("Audio Report/Analysis"), ag.results ());
er.run();
}
}
void
Editor::spectral_analyze_region_selection ()
First commit on FFT analysis window. Still some functionality missing, but it's mostly done. git-svn-id: svn://localhost/trunk/ardour2@383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 16:58:52 -05:00
{
if (analysis_window == 0) {
analysis_window = new AnalysisWindow();
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session != 0)
analysis_window->set_session(_session);
First commit on FFT analysis window. Still some functionality missing, but it's mostly done. git-svn-id: svn://localhost/trunk/ardour2@383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 16:58:52 -05:00
analysis_window->show_all();
}
Make FFT easier to use. right click on a range selection or a region and in the range/region submenu you should find a "Analyze range/region" entry. git-svn-id: svn://localhost/trunk/ardour2@385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 17:35:39 -05:00
analysis_window->set_regionmode();
analysis_window->analyze();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
First commit on FFT analysis window. Still some functionality missing, but it's mostly done. git-svn-id: svn://localhost/trunk/ardour2@383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 16:58:52 -05:00
analysis_window->present();
}
Make FFT easier to use. right click on a range selection or a region and in the range/region submenu you should find a "Analyze range/region" entry. git-svn-id: svn://localhost/trunk/ardour2@385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 17:35:39 -05:00
void
add region & range loudnless report
2016-03-11 11:26:27 -05:00
Editor::spectral_analyze_range_selection()
Make FFT easier to use. right click on a range selection or a region and in the range/region submenu you should find a "Analyze range/region" entry. git-svn-id: svn://localhost/trunk/ardour2@385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 17:35:39 -05:00
{
if (analysis_window == 0) {
analysis_window = new AnalysisWindow();
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session != 0)
analysis_window->set_session(_session);
Make FFT easier to use. right click on a range selection or a region and in the range/region submenu you should find a "Analyze range/region" entry. git-svn-id: svn://localhost/trunk/ardour2@385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 17:35:39 -05:00
analysis_window->show_all();
}
analysis_window->set_rangemode();
analysis_window->analyze();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Make FFT easier to use. right click on a range selection or a region and in the range/region submenu you should find a "Analyze range/region" entry. git-svn-id: svn://localhost/trunk/ardour2@385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 17:35:39 -05:00
analysis_window->present();
}
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Menu*
Use the edit position to decide what items to put in the region context menus, rather than the mouse position. git-svn-id: svn://localhost/ardour2/branches/3.0@8028 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:59 -05:00
Editor::build_track_selection_context_menu ()
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
{
using namespace Menu_Helpers;
MenuList& edit_items = track_selection_context_menu.items();
edit_items.clear ();
add_selection_context_items (edit_items);
// edit_items.push_back (SeparatorElem());
// add_dstream_context_items (edit_items);
return &track_selection_context_menu;
}
Make FFT easier to use. right click on a range selection or a region and in the range/region submenu you should find a "Analyze range/region" entry. git-svn-id: svn://localhost/trunk/ardour2@385 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 17:35:39 -05:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Decide whether to show crossfade and choose-top-region menus based on the mouse position rather than the edit point. I think this is marginally more intuitive. git-svn-id: svn://localhost/ardour2/branches/3.0@8980 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-27 11:43:48 -05:00
Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items, boost::shared_ptr<Track> track)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
using namespace Menu_Helpers;
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
/* OK, stick the region submenu at the top of the list, and then add
the standard items.
*/
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
RegionSelection rs = get_regions_from_selection_and_entered ();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
string menu_item_name = (rs.size() == 1) ? rs.front()->region()->name() : _("Selected Regions");
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
if (_popup_region_menu_item == 0) {
Correctly display region name in context menu
2017-07-01 16:53:40 -04:00
_popup_region_menu_item = new MenuItem (menu_item_name, false);
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
_popup_region_menu_item->set_submenu (*dynamic_cast<Menu*> (ActionManager::get_widget (X_("/PopupRegionMenu"))));
_popup_region_menu_item->show ();
} else {
_popup_region_menu_item->set_label (menu_item_name);
}
no-op - comment/whitespace fixes.
2017-03-04 13:34:41 -05:00
/* No layering allowed in later is higher layering model */
Layering - the return of "later is higher". Currently we don't do anything special on layering prefs change (relayer only occurs when each playlist is first edited). The idea here is that "undo" is still available to restore previous layering in case of any surprises.
2015-05-09 13:15:50 -04:00
RefPtr<Action> act = ActionManager::get_action (X_("EditorMenu"), X_("RegionMenuLayering"));
if (act && Config->get_layer_model() == LaterHigher) {
act->set_sensitive (false);
} else if (act) {
act->set_sensitive (true);
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
const samplepos_t position = get_preferred_edit_position (EDIT_IGNORE_NONE, true);
Decide whether to show crossfade and choose-top-region menus based on the mouse position rather than the edit point. I think this is marginally more intuitive. git-svn-id: svn://localhost/ardour2/branches/3.0@8980 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-27 11:43:48 -05:00
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
edit_items.push_back (*_popup_region_menu_item);
Layering - the return of "later is higher". Currently we don't do anything special on layering prefs change (relayer only occurs when each playlist is first edited). The idea here is that "undo" is still available to restore previous layering in case of any surprises.
2015-05-09 13:15:50 -04:00
if (Config->get_layer_model() == Manual && track->playlist()->count_regions_at (position) > 1 && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588, mostly git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 18:38:56 -05:00
edit_items.push_back (*manage (_region_actions->get_action ("choose-top-region-context-menu")->create_menu_item ()));
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
}
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (SeparatorElem());
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Re-work main right-click context menu to operate on the selection, and remove some confusion about what region(s) will be affected by menu selections. git-svn-id: svn://localhost/ardour2/trunk@1831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 07:53:35 -04:00
/** Add context menu items relevant to selection ranges.
* @param edit_items List to add the items to.
*/
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
{
using namespace Menu_Helpers;
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::play_selection)));
edit_items.push_back (MenuElem (_("Loop Range"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), true)));
Make the FFT Anaylsis optional and disabled by default until further discussion. git-svn-id: svn://localhost/trunk/ardour2@386 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-12 22:27:58 -05:00
Add some new zoom-to-selection actions, so zoom tool is less needed. Reverse order of items in the zoom menus to match Ardour. Consolidate the extra zoom math into a function; this fixes a problem in zoom-to-session.
2014-07-23 12:28:45 -04:00
edit_items.push_back (SeparatorElem());
Further fixes to non-cxx11 enabled builds Hopefully all that is necessary this time
2016-12-13 02:10:30 -05:00
edit_items.push_back (MenuElem (_("Zoom to Range"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal)));
Add some new zoom-to-selection actions, so zoom tool is less needed. Reverse order of items in the zoom menus to match Ardour. Consolidate the extra zoom math into a function; this fixes a problem in zoom-to-session.
2014-07-23 12:28:45 -04:00
Make range selection context menu work again. git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 21:34:38 -05:00
edit_items.push_back (SeparatorElem());
add region & range loudnless report
2016-03-11 11:26:27 -05:00
edit_items.push_back (MenuElem (_("Loudness Analysis"), sigc::mem_fun(*this, &Editor::loudness_analyze_range_selection)));
edit_items.push_back (MenuElem (_("Spectral Analysis"), sigc::mem_fun(*this, &Editor::spectral_analyze_range_selection)));
GUI support to en/disable master-bus output gain control
2020-07-20 23:51:56 -04:00
edit_items.push_back (SeparatorElem());
Cont'd work on Loudness Assistant * use relative gain for analysis * allow to select constraints * tweak UI layout, use monospace font
2020-07-21 21:26:19 -04:00
edit_items.push_back (MenuElem (_("Loudness Assistant..."), sigc::mem_fun(*this, &Editor::analyze_range_export)));
Remove extend-range-to-{start,end}-of-region and replace with move-range-{start,end}-to-{previous,next}-region boundary after discussions with Chris. Seems to make more sense, and works without the need for a region selection, which is fiddly to adjust when one is in range mode. git-svn-id: svn://localhost/ardour2/branches/3.0@9360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-17 09:55:41 -04:00
edit_items.push_back (SeparatorElem());
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
Remove extend-range-to-{start,end}-of-region and replace with move-range-{start,end}-to-{previous,next}-region boundary after discussions with Chris. Seems to make more sense, and works without the need for a region selection, which is fiddly to adjust when one is in range mode. git-svn-id: svn://localhost/ardour2/branches/3.0@9360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-17 09:55:41 -04:00
edit_items.push_back (
MenuElem (
_("Move Range Start to Previous Region Boundary"),
sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), false, false)
)
);
edit_items.push_back (
MenuElem (
_("Move Range Start to Next Region Boundary"),
sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), false, true)
)
);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Remove extend-range-to-{start,end}-of-region and replace with move-range-{start,end}-to-{previous,next}-region boundary after discussions with Chris. Seems to make more sense, and works without the need for a region selection, which is fiddly to adjust when one is in range mode. git-svn-id: svn://localhost/ardour2/branches/3.0@9360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-17 09:55:41 -04:00
edit_items.push_back (
MenuElem (
_("Move Range End to Previous Region Boundary"),
sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), true, false)
)
);
edit_items.push_back (
MenuElem (
_("Move Range End to Next Region Boundary"),
sigc::bind (sigc::mem_fun (*this, &Editor::move_range_selection_start_or_end_to_region_boundary), true, true)
)
);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Make range selection context menu work again. git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 21:34:38 -05:00
edit_items.push_back (SeparatorElem());
rename "Convert to Region In-Place" to "Separate" since it is known by that name elsehwere and in the code
2014-12-30 19:52:44 -05:00
edit_items.push_back (MenuElem (_("Separate"), mem_fun(*this, &Editor::separate_region_from_selection)));
(Source List) Source list, Region List: Resolve various action+behaviors between the 2 lists. Duplicate the remove_unsued_region action in the Session->Cleanup menu, for discoverability. Region list should use the same Region actions as the canvas... OK, now resolve the change in use-cases of Region List and Source List. tentative. Rough-in remove_selected_sources (Delete in Sources list). Column tweaks.
2018-10-22 17:46:44 -04:00
// edit_items.push_back (MenuElem (_("Convert to Region in Region List"), sigc::mem_fun(*this, &Editor::new_region_from_selection)));
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Make range selection context menu work again. git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 21:34:38 -05:00
edit_items.push_back (SeparatorElem());
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Select All in Range"), sigc::mem_fun(*this, &Editor::select_all_selectables_using_time_selection)));
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
Make range selection context menu work again. git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 21:34:38 -05:00
edit_items.push_back (SeparatorElem());
now that regions and range selections are exclusive, the separate actions to set ranges or zoom to selections are redundant. save some menu entries and keybindings by consolidating them. also consolidate some code with new function get_selection_extents(). as a side-effect, this checkin fixes the assert failure in play_with_preroll
2015-01-07 16:31:05 -05:00
edit_items.push_back (MenuElem (_("Set Loop from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::set_loop_from_selection), false)));
edit_items.push_back (MenuElem (_("Set Punch from Selection"), sigc::mem_fun(*this, &Editor::set_punch_from_selection)));
edit_items.push_back (MenuElem (_("Set Session Start/End from Selection"), sigc::mem_fun(*this, &Editor::set_session_extents_from_selection)));
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Make range selection context menu work again. git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 21:34:38 -05:00
edit_items.push_back (SeparatorElem());
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Add Range Markers"), sigc::mem_fun (*this, &Editor::add_location_from_selection)));
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Make range selection context menu work again. git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 21:34:38 -05:00
edit_items.push_back (SeparatorElem());
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Crop Region to Range"), sigc::mem_fun(*this, &Editor::crop_region_to_selection)));
Rename Editor::duplicate_dialog to Editor::duplicate_range git-svn-id: svn://localhost/ardour2/branches/3.0@12988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 17:31:06 -04:00
edit_items.push_back (MenuElem (_("Duplicate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_range), false)));
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Make range selection context menu work again. git-svn-id: svn://localhost/ardour2/branches/3.0@4611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 21:34:38 -05:00
edit_items.push_back (SeparatorElem());
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Consolidate Range"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), true, false)));
Make capitalization consistent and other minor spelling corrections.
2015-11-29 14:17:11 -05:00
edit_items.push_back (MenuElem (_("Consolidate Range with Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), true, true)));
(Source List) Source list, Region List: Resolve various action+behaviors between the 2 lists. Duplicate the remove_unsued_region action in the Session->Cleanup menu, for discoverability. Region list should use the same Region actions as the canvas... OK, now resolve the change in use-cases of Region List and Source List. tentative. Rough-in remove_selected_sources (Delete in Sources list). Column tweaks.
2018-10-22 17:46:44 -04:00
edit_items.push_back (MenuElem (_("Bounce Range to Source List"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, false)));
edit_items.push_back (MenuElem (_("Bounce Range to Source List with Processing"), sigc::bind (sigc::mem_fun(*this, &Editor::bounce_range_selection), false, true)));
Add a couple of missing ellipses to menu items. git-svn-id: svn://localhost/ardour2/branches/3.0@10215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-17 20:24:29 -04:00
edit_items.push_back (MenuElem (_("Export Range..."), sigc::mem_fun(*this, &Editor::export_selection)));
export video-range: add to context menu
2013-10-12 16:55:54 -04:00
if (ARDOUR_UI::instance()->video_timeline->get_duration() > 0) {
prepare saving video-export settings. * migrate dialog from Editor to UI. * make it a WM proxied window * prepare applying state after construction..
2015-02-27 17:17:26 -05:00
edit_items.push_back (MenuElem (_("Export Video Range..."), sigc::bind (sigc::mem_fun(*(ARDOUR_UI::instance()), &ARDOUR_UI::export_video), true)));
export video-range: add to context menu
2013-10-12 16:55:54 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
using namespace Menu_Helpers;
/* Playback */
Menu *play_menu = manage (new Menu);
MenuList& play_items = play_menu->items();
play_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Make capitalization consistent and other minor spelling corrections.
2015-11-29 14:17:11 -05:00
play_items.push_back (MenuElem (_("Play from Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)));
play_items.push_back (MenuElem (_("Play from Start"), sigc::mem_fun(*this, &Editor::play_from_start)));
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
play_items.push_back (MenuElem (_("Play Region"), sigc::mem_fun(*this, &Editor::play_selected_region)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
play_items.push_back (SeparatorElem());
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
play_items.push_back (MenuElem (_("Loop Region"), sigc::bind (sigc::mem_fun (*this, &Editor::set_loop_from_region), true)));
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
edit_items.push_back (MenuElem (_("Play"), *play_menu));
/* Selection */
Menu *select_menu = manage (new Menu);
MenuList& select_items = select_menu->items();
select_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
select_items.push_back (MenuElem (_("Select All in Track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
remove some cruft with previous commits. remove option link-region-and-track-selection since they are now exclusive, and rename select-all-regions to select-all-objects to match the implementation
2014-07-06 14:53:56 -04:00
select_items.push_back (MenuElem (_("Select All Objects"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_objects), Selection::Set)));
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
select_items.push_back (MenuElem (_("Invert Selection in Track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track)));
select_items.push_back (MenuElem (_("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection)));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
select_items.push_back (SeparatorElem());
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
select_items.push_back (MenuElem (_("Set Range to Loop Range"), sigc::mem_fun(*this, &Editor::set_selection_from_loop)));
select_items.push_back (MenuElem (_("Set Range to Punch Range"), sigc::mem_fun(*this, &Editor::set_selection_from_punch)));
expose set-range-selection-from-region-selection operation in more places
2015-04-24 14:09:48 -04:00
select_items.push_back (MenuElem (_("Set Range to Selected Regions"), sigc::mem_fun(*this, &Editor::set_selection_from_region)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
select_items.push_back (SeparatorElem());
Fix "Select All * Edit Point" when used as shortcut. -fixes #6626
2015-10-07 17:56:14 -04:00
select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true, true)));
select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false, true)));
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
select_items.push_back (MenuElem (_("Select All Between Playhead and Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), false)));
select_items.push_back (MenuElem (_("Select All Within Playhead and Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_between), true)));
select_items.push_back (MenuElem (_("Select Range Between Playhead and Edit Point"), sigc::mem_fun(*this, &Editor::select_range_between)));
Re-work main right-click context menu to operate on the selection, and remove some confusion about what region(s) will be affected by menu selections. git-svn-id: svn://localhost/ardour2/trunk@1831 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-05-10 07:53:35 -04:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
edit_items.push_back (MenuElem (_("Select"), *select_menu));
/* Cut-n-Paste */
Menu *cutnpaste_menu = manage (new Menu);
MenuList& cutnpaste_items = cutnpaste_menu->items();
cutnpaste_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
cutnpaste_items.push_back (MenuElem (_("Cut"), sigc::mem_fun(*this, &Editor::cut)));
cutnpaste_items.push_back (MenuElem (_("Copy"), sigc::mem_fun(*this, &Editor::copy)));
centralize use of "from-context-menu" in Editor::get_preferred_edit_position(), and use it when pasting as well git-svn-id: svn://localhost/ardour2/branches/3.0@11118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 12:28:05 -05:00
cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (sigc::mem_fun(*this, &Editor::paste), 1.0f, true)));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
cutnpaste_items.push_back (SeparatorElem());
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
cutnpaste_items.push_back (MenuElem (_("Align"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions), ARDOUR::SyncPoint)));
cutnpaste_items.push_back (MenuElem (_("Align Relative"), sigc::bind (sigc::mem_fun (*this, &Editor::align_regions_relative), ARDOUR::SyncPoint)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
/* Adding new material */
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (SeparatorElem());
(Source List) Implement insert-region action... now uses the Source List.
2019-07-30 14:02:15 -04:00
edit_items.push_back (MenuElem (_("Insert Selected Region"), sigc::bind (sigc::mem_fun(*this, &Editor::insert_source_list_selection), 1.0f)));
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
edit_items.push_back (MenuElem (_("Insert Existing Media"), sigc::bind (sigc::mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
/* Nudge track */
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Menu *nudge_menu = manage (new Menu());
MenuList& nudge_items = nudge_menu->items();
nudge_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
edit_items.push_back (SeparatorElem());
Use Later / Earlier in descriptions of nudging and some playhead movements, instead of Forward / Backward (#4879). git-svn-id: svn://localhost/ardour2/branches/3.0@12314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 19:03:47 -04:00
nudge_items.push_back (MenuElem (_("Nudge Entire Track Later"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true))));
nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Later"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true))));
nudge_items.push_back (MenuElem (_("Nudge Entire Track Earlier"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false))));
nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Earlier"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false))));
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
void
Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
{
using namespace Menu_Helpers;
/* Playback */
Menu *play_menu = manage (new Menu);
MenuList& play_items = play_menu->items();
play_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Make capitalization consistent and other minor spelling corrections.
2015-11-29 14:17:11 -05:00
play_items.push_back (MenuElem (_("Play from Edit Point"), sigc::mem_fun(*this, &Editor::play_from_edit_point)));
play_items.push_back (MenuElem (_("Play from Start"), sigc::mem_fun(*this, &Editor::play_from_start)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (MenuElem (_("Play"), *play_menu));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
/* Selection */
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Menu *select_menu = manage (new Menu);
MenuList& select_items = select_menu->items();
select_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
select_items.push_back (MenuElem (_("Select All in Track"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
remove some cruft with previous commits. remove option link-region-and-track-selection since they are now exclusive, and rename select-all-regions to select-all-objects to match the implementation
2014-07-06 14:53:56 -04:00
select_items.push_back (MenuElem (_("Select All Objects"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_objects), Selection::Set)));
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
select_items.push_back (MenuElem (_("Invert Selection in Track"), sigc::mem_fun(*this, &Editor::invert_selection_in_track)));
select_items.push_back (MenuElem (_("Invert Selection"), sigc::mem_fun(*this, &Editor::invert_selection)));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
select_items.push_back (SeparatorElem());
Fix "Select All * Edit Point" when used as shortcut. -fixes #6626
2015-10-07 17:56:14 -04:00
select_items.push_back (MenuElem (_("Select All After Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), true, true)));
select_items.push_back (MenuElem (_("Select All Before Edit Point"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_edit), false, true)));
Minor cleanups to menu code. Some copyediting of menu items for HIG compliance. git-svn-id: svn://localhost/ardour2/branches/3.0@6486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-13 20:04:27 -05:00
select_items.push_back (MenuElem (_("Select All After Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
select_items.push_back (MenuElem (_("Select All Before Playhead"), sigc::bind (sigc::mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (MenuElem (_("Select"), *select_menu));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
/* Cut-n-Paste */
Request for comment: Bug or feature?
2019-03-07 11:00:47 -05:00
#if 0 // unused, why?
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Menu *cutnpaste_menu = manage (new Menu);
MenuList& cutnpaste_items = cutnpaste_menu->items();
cutnpaste_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
cutnpaste_items.push_back (MenuElem (_("Cut"), sigc::mem_fun(*this, &Editor::cut)));
cutnpaste_items.push_back (MenuElem (_("Copy"), sigc::mem_fun(*this, &Editor::copy)));
centralize use of "from-context-menu" in Editor::get_preferred_edit_position(), and use it when pasting as well git-svn-id: svn://localhost/ardour2/branches/3.0@11118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 12:28:05 -05:00
cutnpaste_items.push_back (MenuElem (_("Paste"), sigc::bind (sigc::mem_fun(*this, &Editor::paste), 1.0f, true)));
Request for comment: Bug or feature?
2019-03-07 11:00:47 -05:00
#endif
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
Menu *nudge_menu = manage (new Menu());
MenuList& nudge_items = nudge_menu->items();
nudge_menu->set_name ("ArdourContextMenu");
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (SeparatorElem());
Use Later / Earlier in descriptions of nudging and some playhead movements, instead of Forward / Backward (#4879). git-svn-id: svn://localhost/ardour2/branches/3.0@12314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-16 19:03:47 -04:00
nudge_items.push_back (MenuElem (_("Nudge Entire Track Later"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, true))));
nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Later"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, true))));
nudge_items.push_back (MenuElem (_("Nudge Entire Track Earlier"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), false, false))));
nudge_items.push_back (MenuElem (_("Nudge Track After Edit Point Earlier"), (sigc::bind (sigc::mem_fun(*this, &Editor::nudge_track), true, false))));
Merge with 2.0-ongoing R2885. Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-12 18:45:50 -05:00
edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
GridType
Editor::grid_type() const
provide accessors to Editor::snap_{type,mode} ; when nudging notes, use grid in preference to nudge clock git-svn-id: svn://localhost/ardour2/branches/3.0@5934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 19:43:04 -04:00
{
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
return _grid_type;
provide accessors to Editor::snap_{type,mode} ; when nudging notes, use grid in preference to nudge clock git-svn-id: svn://localhost/ardour2/branches/3.0@5934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 19:43:04 -04:00
}
Tempo ramps - tempos now musically snap to their future.
2016-03-28 11:23:29 -04:00
bool
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
Editor::grid_musical() const
{
switch (_grid_type) {
case GridTypeBeatDiv32:
case GridTypeBeatDiv28:
case GridTypeBeatDiv24:
case GridTypeBeatDiv20:
case GridTypeBeatDiv16:
case GridTypeBeatDiv14:
case GridTypeBeatDiv12:
case GridTypeBeatDiv10:
case GridTypeBeatDiv8:
case GridTypeBeatDiv7:
case GridTypeBeatDiv6:
case GridTypeBeatDiv5:
case GridTypeBeatDiv4:
case GridTypeBeatDiv3:
case GridTypeBeatDiv2:
case GridTypeBeat:
case GridTypeBar:
Tempo ramps - tempos now musically snap to their future.
2016-03-28 11:23:29 -04:00
return true;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
case GridTypeNone:
Rename SMPTE enum back to Timecode.
2018-02-26 19:38:18 -05:00
case GridTypeTimecode:
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
case GridTypeMinSec:
Fix a rather large naming thinko: GridTypeSamples should be CDFrames.
2018-02-26 18:02:24 -05:00
case GridTypeCDFrame:
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
return false;
Tempo ramps - tempos now musically snap to their future.
2016-03-28 11:23:29 -04:00
}
return false;
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
bool
Editor::grid_nonmusical() const
{
switch (_grid_type) {
Rename SMPTE enum back to Timecode.
2018-02-26 19:38:18 -05:00
case GridTypeTimecode:
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
case GridTypeMinSec:
Fix a rather large naming thinko: GridTypeSamples should be CDFrames.
2018-02-26 18:02:24 -05:00
case GridTypeCDFrame:
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
return true;
case GridTypeBeatDiv32:
case GridTypeBeatDiv28:
case GridTypeBeatDiv24:
case GridTypeBeatDiv20:
case GridTypeBeatDiv16:
case GridTypeBeatDiv14:
case GridTypeBeatDiv12:
case GridTypeBeatDiv10:
case GridTypeBeatDiv8:
case GridTypeBeatDiv7:
case GridTypeBeatDiv6:
case GridTypeBeatDiv5:
case GridTypeBeatDiv4:
case GridTypeBeatDiv3:
case GridTypeBeatDiv2:
case GridTypeBeat:
case GridTypeBar:
case GridTypeNone:
return false;
}
return false;
}
provide accessors to Editor::snap_{type,mode} ; when nudging notes, use grid in preference to nudge clock git-svn-id: svn://localhost/ardour2/branches/3.0@5934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 19:43:04 -04:00
SnapMode
Editor::snap_mode() const
{
return _snap_mode;
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
Editor::show_rulers_for_grid ()
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
{
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
/* show appropriate rulers for this grid setting. */
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (grid_musical()) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
ruler_tempo_action->set_active(true);
ruler_meter_action->set_active(true);
ruler_bbt_action->set_active(true);
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
if (UIConfiguration::instance().get_rulers_follow_grid()) {
new_grid: Add options for rulers_follow_grid and grid_follows_internal
2018-07-26 14:53:36 -04:00
ruler_timecode_action->set_active(false);
ruler_minsec_action->set_active(false);
ruler_samples_action->set_active(false);
}
} else if (_grid_type == GridTypeTimecode) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
ruler_timecode_action->set_active(true);
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
if (UIConfiguration::instance().get_rulers_follow_grid()) {
new_grid: Add options for rulers_follow_grid and grid_follows_internal
2018-07-26 14:53:36 -04:00
ruler_tempo_action->set_active(false);
ruler_meter_action->set_active(false);
ruler_bbt_action->set_active(false);
ruler_minsec_action->set_active(false);
ruler_samples_action->set_active(false);
}
} else if (_grid_type == GridTypeMinSec) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
ruler_minsec_action->set_active(true);
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
if (UIConfiguration::instance().get_rulers_follow_grid()) {
new_grid: Add options for rulers_follow_grid and grid_follows_internal
2018-07-26 14:53:36 -04:00
ruler_tempo_action->set_active(false);
ruler_meter_action->set_active(false);
ruler_bbt_action->set_active(false);
ruler_timecode_action->set_active(false);
ruler_samples_action->set_active(false);
}
} else if (_grid_type == GridTypeCDFrame) {
ruler_cd_marker_action->set_active(true);
Switch CDFrame grid to use MinSec ruler rather than Sample ruler.
2018-02-26 19:52:28 -05:00
ruler_minsec_action->set_active(true);
Fix a rather large naming thinko: GridTypeSamples should be CDFrames.
2018-02-26 18:02:24 -05:00
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
if (UIConfiguration::instance().get_rulers_follow_grid()) {
new_grid: Add options for rulers_follow_grid and grid_follows_internal
2018-07-26 14:53:36 -04:00
ruler_tempo_action->set_active(false);
ruler_meter_action->set_active(false);
ruler_bbt_action->set_active(false);
ruler_timecode_action->set_active(false);
ruler_samples_action->set_active(false);
}
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
}
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
}
void
Editor::set_grid_to (GridType gt)
{
if (_grid_type == gt) { // already set
return;
}
unsigned int grid_ind = (unsigned int)gt;
if (internal_editing() && UIConfiguration::instance().get_grid_follows_internal()) {
internal_grid_type = gt;
} else {
pre_internal_grid_type = gt;
}
_grid_type = gt;
if (grid_ind > grid_type_strings.size() - 1) {
grid_ind = 0;
_grid_type = (GridType)grid_ind;
}
string str = grid_type_strings[grid_ind];
if (str != grid_type_selector.get_text()) {
grid_type_selector.set_text (str);
}
Allow to disable smart ruler changes.
2018-07-26 18:25:42 -04:00
if (UIConfiguration::instance().get_show_grids_ruler()) {
show_rulers_for_grid ();
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
instant_save ();
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (grid_musical()) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
compute_bbt_ruler_scale (_leftmost_sample, _leftmost_sample + current_page_samples());
Improve bbt ruler drawing performance for large time ranges. - when the timeline displays many bars, zoom/autoscroll speed is improved by calculating the bbt ruler scale first then requesting a suitably scaled grid.
2016-10-18 12:56:43 -04:00
update_tempo_based_rulers ();
adjust the way we use a pair of iterators into the tempo map so that the iterators are always local to the scope where they are used, which fixes at least one tempo-map related crash; also fix correct setting of join-object-range parameter, where the property wasn't actually used git-svn-id: svn://localhost/ardour2/branches/3.0@13559 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 17:48:59 -05:00
}
Merge with 2.0-ongoing R3082. Superficial generification of export stuff. git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 17:10:27 -05:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
mark_region_boundary_cache_dirty ();
Rudimentary ghost note when adding MIDI notes to a region, as per #3180. git-svn-id: svn://localhost/ardour2/branches/3.0@7162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 19:14:41 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
redisplay_grid (false);
Draw beat sudivisions according to snap setting.
2015-01-07 19:05:21 -05:00
Rudimentary ghost note when adding MIDI notes to a region, as per #3180. git-svn-id: svn://localhost/ardour2/branches/3.0@7162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-25 19:14:41 -04:00
SnapChanged (); /* EMIT SIGNAL */
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
Editor::set_snap_mode (SnapMode mode)
{
Restore snap when switching to/from internal.
2014-12-16 23:02:28 -05:00
if (internal_editing()) {
internal_snap_mode = mode;
} else {
pre_internal_snap_mode = mode;
}
fix restore of snap mode (confusion caused by existence of internal/preinternal snap modes) git-svn-id: svn://localhost/ardour2/branches/3.0@13878 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-18 10:56:41 -05:00
_snap_mode = mode;
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (_snap_mode == SnapOff) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
snap_mode_button.set_active_state (Gtkmm2ext::Off);
} else {
snap_mode_button.set_active_state (Gtkmm2ext::ExplicitActive);
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
instant_save ();
}
Relative snap
2015-05-15 14:15:52 -04:00
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
void
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
Editor::set_edit_point_preference (EditPoint ep, bool force)
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
{
Fix Mixbus special case
2019-03-29 09:53:07 -04:00
if (Profile->get_mixbus()) {
if (ep == EditAtSelectedMarker) {
ep = EditAtPlayhead;
}
}
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
bool changed = (_edit_point != ep);
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
_edit_point = ep;
Fix edit point selector on Mixbus.
2014-11-18 02:19:03 -05:00
string str = edit_point_strings[(int)ep];
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
if (str != edit_point_selector.get_text ()) {
edit_point_selector.set_text (str);
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
}
Fix cursor update on nested entry. For example, if you're in a note and something about the mode changes, it's the underlying region context that needs to change. So, seems we need a stack of entry contexts to deal with this sort of thing. Switching in/out of smart mode still doesn't update immediately because we don't have the y-coordinate needed to update it.
2014-12-23 13:46:53 -05:00
update_all_enter_cursors();
Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 17:43:18 -05:00
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
if (!force && !changed) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
return;
}
Assortment of minor changes from 2.0-ongoing. git-svn-id: svn://localhost/ardour2/branches/3.0@3852 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-03 14:24:38 -04:00
const char* action=NULL;
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
switch (_edit_point) {
case EditAtPlayhead:
action = "edit-at-playhead";
break;
case EditAtSelectedMarker:
Fix action-name
2019-03-29 09:52:25 -04:00
action = "edit-at-selected-marker";
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
break;
case EditAtMouse:
action = "edit-at-mouse";
break;
}
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action ("Editor", action);
tact->set_active (true);
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t foo;
merge 3.0 from 2.0-ongoing@3243 git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 10:06:50 -04:00
bool in_track_canvas;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (!mouse_sample (foo, in_track_canvas)) {
merge 3.0 from 2.0-ongoing@3243 git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 10:06:50 -04:00
in_track_canvas = false;
}
reset_canvas_action_sensitivity (in_track_canvas);
check region action sensitivity from two more places that may alter it
2017-02-16 04:29:32 -05:00
sensitize_the_right_region_actions (false);
merge 3.0 from 2.0-ongoing@3243 git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-04-11 10:06:50 -04:00
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
instant_save ();
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
int
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
Editor::set_state (const XMLNode& node, int version)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
make Stateful::_id private and provide appropriate methods to set it, and use them throughout ardour git-svn-id: svn://localhost/ardour2/branches/3.0@10222 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 09:18:47 -04:00
set_id (node);
Don't save instant while loading instant.xml opening a recent session from a session can result in: Editor::constructed and session_loaded() being true. A partial instant_save can occur (not to mention: invalid XMLnode iterators)
2016-05-18 14:06:20 -04:00
PBD::Unwinder<bool> nsi (no_save_instant, true);
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
bool yn;
fix style overwriting done by fastmeter, and lack of clip mask/clip origin restore in pixscroller; fixes meter redraw botch when moving fader, and the style fix corrects visual problems with Clearlooks as soon a ameter is realized git-svn-id: svn://localhost/trunk/ardour2@323 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-13 11:08:32 -05:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
Tabbable::set_state (node, version);
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t ph_pos;
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (_session && node.get_property ("playhead", ph_pos)) {
if (ph_pos >= 0) {
playhead_cursor->set_position (ph_pos);
prevent negative playhead positions from entering code via serialized state
2014-10-22 12:17:59 -04:00
} else {
warning << _("Playhead position stored with a negative value - ignored (use zero instead)") << endmsg;
playhead_cursor->set_position (0);
}
Merged with trunk R1304 git-svn-id: svn://localhost/ardour2/branches/midi@1311 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 14:50:49 -05:00
} else {
playhead_cursor->set_position (0);
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node.get_property ("mixer-width", editor_mixer_strip_width);
Merged with trunk R1761 git-svn-id: svn://localhost/ardour2/branches/midi@1762 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-29 13:23:11 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node.get_property ("zoom-focus", zoom_focus);
zoom_focus_selection_done (zoom_focus);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
double z;
if (node.get_property ("zoom", z)) {
switch samples_per_pixel to integer type
2013-06-18 23:02:54 -04:00
/* older versions of ardour used floating point samples_per_pixel */
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
reset_zoom (llrintf (z));
Don't call reset_zoom with the default frames_per_unit if we have got a different value from the Editor's state. Fixes restore of zoom level on session load. git-svn-id: svn://localhost/ardour2/branches/3.0@7705 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-28 21:06:05 -04:00
} else {
change frames_per_pixel to samples_per_pixel
2013-04-12 11:31:50 -04:00
reset_zoom (samples_per_pixel);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
int32_t cnt;
if (node.get_property ("visible-track-count", cnt)) {
set_visible_track_count (cnt);
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
GridType grid_type;
if (!node.get_property ("grid-type", grid_type)) {
grid_type = _grid_type;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
set_grid_to (grid_type);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
SnapMode sm;
if (node.get_property ("snap-mode", sm)) {
snap_mode_selection_done(sm);
initialize snap-mode dropdown text "SnapOff" is the default, so no change is triggered when calling set_active() and initially the dropdown/ardour-button remains blank.
2016-05-18 14:07:11 -04:00
/* set text of Dropdown. in case _snap_mode == SnapOff (default)
* snap_mode_selection_done() will only mark an already active item as active
* which does not trigger set_text().
*/
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
set_snap_mode (sm);
ensure that dropdowns in editor toolbar are populated at first use (with no existing config file to set them)
2016-06-06 14:26:23 -04:00
} else {
set_snap_mode (_snap_mode);
(1) remove magic number voodoo when saving zoom focus/snap settings to instant.xml etc. (this has a minor breaking-behaviour for existing sessions etc (2) keep track of grid type/settings in and out of note edit mode and switch back and forth, thus allowing independent grids while working at the note or region level git-svn-id: svn://localhost/ardour2/branches/3.0@11486 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-13 09:34:21 -05:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
node.get_property ("internal-grid-type", internal_grid_type);
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node.get_property ("internal-snap-mode", internal_snap_mode);
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
node.get_property ("pre-internal-grid-type", pre_internal_grid_type);
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node.get_property ("pre-internal-snap-mode", pre_internal_snap_mode);
Restore snap when switching to/from internal.
2014-12-16 23:02:28 -05:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
std::string mm_str;
if (node.get_property ("mouse-mode", mm_str)) {
MouseMode m = str2mousemode(mm_str);
fix style overwriting done by fastmeter, and lack of clip mask/clip origin restore in pixscroller; fixes meter redraw botch when moving fader, and the style fix corrects visual problems with Clearlooks as soon a ameter is realized git-svn-id: svn://localhost/trunk/ardour2@323 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-02-13 11:08:32 -05:00
set_mouse_mode (m, true);
} else {
set_mouse_mode (MouseObject, true);
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t lf_pos;
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (node.get_property ("left-frame", lf_pos)) {
if (lf_pos < 0) {
lf_pos = 0;
restore editor with leftmost frame preserved git-svn-id: svn://localhost/ardour2/branches/3.0@6199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-27 20:53:41 -05:00
}
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
reset_x_origin (lf_pos);
restore editor with leftmost frame preserved git-svn-id: svn://localhost/ardour2/branches/3.0@6199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-27 20:53:41 -05:00
}
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
double y_origin;
if (node.get_property ("y-origin", y_origin)) {
reset_y_origin (y_origin);
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
}
Initialize per session instant state Per session (instant.xml) GUI options do not have a sigc::slot<> backed configuration interface to initialize the Actions. This fixes a first-time start issue (no instant.xml) where GUI panes may be visible (default) while the actions are "off" (default). This is a tentative solution, instant.xml backed ToggleAction initialization needs to be consolidated somehow.
2019-02-28 16:56:35 -05:00
yn = false;
node.get_property ("join-object-range", yn);
{
RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("MouseMode"), X_("set-mouse-mode-object-range"));
/* do it twice to force the change */
tact->set_active (!yn);
tact->set_active (yn);
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
set_mouse_mode(mouse_mode, true);
First cut of some Pro-tools inspired editing features; linked play/play range and linked object/range modes. git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-01 17:11:15 -05:00
}
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
EditPoint ep;
if (node.get_property ("edit-point", ep)) {
set_edit_point_preference (ep, true);
ensure that dropdowns in editor toolbar are populated at first use (with no existing config file to set them)
2016-06-06 14:26:23 -04:00
} else {
set_edit_point_preference (_edit_point);
Another similar fix for use of an uninitialized variable. git-svn-id: svn://localhost/ardour2/branches/3.0@5457 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-01 22:17:14 -04:00
}
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (node.get_property ("follow-playhead", yn)) {
Merged with trunk R1736. git-svn-id: svn://localhost/ardour2/branches/midi@1737 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-22 14:01:10 -04:00
set_follow_playhead (yn);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (node.get_property ("stationary-playhead", yn)) {
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
set_stationary_playhead (yn);
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
(Source List) Region List rewrite (gtk2 part) See: https://docs.google.com/document/d/1sI7p9RoRVZtNx2n67RvBa0_16fuZblV_lNkkKN2g93s/edit?usp=sharing
2018-11-15 10:24:37 -05:00
if (node.get_property ("show-editor-mixer", yn)) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("show-editor-mixer"));
Option to show lines below markers (#3529). git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 13:29:32 -05:00
/* do it twice to force the change */
tact->set_active (!yn);
tact->set_active (yn);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Initialize per session instant state Per session (instant.xml) GUI options do not have a sigc::slot<> backed configuration interface to initialize the Actions. This fixes a first-time start issue (no instant.xml) where GUI panes may be visible (default) while the actions are "off" (default). This is a tentative solution, instant.xml backed ToggleAction initialization needs to be consolidated somehow.
2019-02-28 16:56:35 -05:00
yn = false;
node.get_property ("show-editor-list", yn);
{
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("show-editor-list"));
Option to show lines below markers (#3529). git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 13:29:32 -05:00
/* do it twice to force the change */
tact->set_active (!yn);
tact->set_active (yn);
User toggling of editor region/route/etc list, ala editor mixer. Canvas, from sea to shining sea. git-svn-id: svn://localhost/ardour2/trunk@1983 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-06-15 03:39:20 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
int32_t el_page;
if (node.get_property (X_("editor-list-page"), el_page)) {
_the_notebook.set_current_page (el_page);
Save and restore the selected tab and its width in the editor list. git-svn-id: svn://localhost/ardour2/branches/3.0@6860 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-05 13:38:54 -04:00
}
Initialize per session instant state Per session (instant.xml) GUI options do not have a sigc::slot<> backed configuration interface to initialize the Actions. This fixes a first-time start issue (no instant.xml) where GUI panes may be visible (default) while the actions are "off" (default). This is a tentative solution, instant.xml backed ToggleAction initialization needs to be consolidated somehow.
2019-02-28 16:56:35 -05:00
yn = false;
node.get_property (X_("show-marker-lines"), yn);
{
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("show-marker-lines"));
/* do it twice to force the change */
Option to show lines below markers (#3529). git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 13:29:32 -05:00
tact->set_active (!yn);
tact->set_active (yn);
}
First go at saving window visibility and position state across saves. git-svn-id: svn://localhost/ardour2/branches/3.0@7644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-17 22:20:15 -04:00
XMLNodeList children = node.children ();
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
selection->set_state (**i, Stateful::current_state_version);
Save / restore settings from the editor region list context menu. git-svn-id: svn://localhost/ardour2/branches/3.0@7804 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-18 22:18:59 -04:00
_regions->set_state (**i);
Save/restore location clock mode - save mode separately for Editor-sidebar and Location Window - cache mode (multiple calls to set_session()) - fix restore: after creating the editor, instant_save() is called, potentially overwriting the previous value.
2017-02-14 11:15:16 -05:00
_locations->set_state (**i);
First go at saving window visibility and position state across saves. git-svn-id: svn://localhost/ardour2/branches/3.0@7644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-17 22:20:15 -04:00
}
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (node.get_property ("maximised", yn)) {
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Common"), X_("ToggleMaximalEditor"));
bool fs = tact->get_active();
fix editor full-screen state when re-loading session
2014-03-21 10:20:25 -04:00
if (yn ^ fs) {
dramatically simplify maximi[sz]ation code, ripping out all the old pane sizing stuff that seems to be a left over from gtk1 (!) git-svn-id: svn://localhost/ardour2/branches/3.0@11344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 22:03:25 -05:00
ActionManager::do_action ("Common", "ToggleMaximalEditor");
}
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t nudge_clock_value;
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (node.get_property ("nudge-clock-value", nudge_clock_value)) {
nudge_clock->set (nudge_clock_value);
save nudge clock value; don't reset the nudge clock mode when loading a session (possibly some finessing required here, since presumably mode and value should be per-session and are saved in the session instant.xml anyway) git-svn-id: svn://localhost/ardour2/branches/3.0@11721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-17 10:10:44 -04:00
} else {
nudge_clock->set_mode (AudioClock::Timecode);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
nudge_clock->set (_session->sample_rate() * 5, true);
save nudge clock value; don't reset the nudge clock mode when loading a session (possibly some finessing required here, since presumably mode and value should be per-session and are saved in the session instant.xml anyway) git-svn-id: svn://localhost/ardour2/branches/3.0@11721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-17 10:10:44 -04:00
}
properly apply default state Actions that also have a private editor variable need to be applied regardless of XML state.
2015-03-21 14:31:02 -04:00
{
/* apply state
* Not all properties may have been in XML, but
* those that are linked to a private variable may need changing
*/
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
RefPtr<ToggleAction> tact;
properly apply default state Actions that also have a private editor variable need to be applied regardless of XML state.
2015-03-21 14:31:02 -04:00
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
tact = ActionManager::get_toggle_action (X_("Editor"), X_("toggle-follow-playhead"));
properly apply default state Actions that also have a private editor variable need to be applied regardless of XML state.
2015-03-21 14:31:02 -04:00
yn = _follow_playhead;
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
if (tact->get_active() != yn) {
tact->set_active (yn);
properly apply default state Actions that also have a private editor variable need to be applied regardless of XML state.
2015-03-21 14:31:02 -04:00
}
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
tact = ActionManager::get_toggle_action (X_("Editor"), X_("toggle-stationary-playhead"));
properly apply default state Actions that also have a private editor variable need to be applied regardless of XML state.
2015-03-21 14:31:02 -04:00
yn = _stationary_playhead;
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
if (tact->get_active() != yn) {
tact->set_active (yn);
properly apply default state Actions that also have a private editor variable need to be applied regardless of XML state.
2015-03-21 14:31:02 -04:00
}
}
Save Lua UI scripts separately Previously EditorAction and ExitorHook scripts were saved with instant.xml. The were saved with each session and in the config dir (for new sessions). This allowed inconsistent UI setups, especially when loading old sessions that had no or different scripts. Now Editor scripts (actions and hooks) are saved in a dedicated file, session-independently. This goes along with ui_config in general e.g. action-table-columns The scripts are not saved with ui_config file for two reasons: ui_config settings related to built-in ui_config_vars.h, and in the future there may be further indirection like "ui-rc-file". Note: previously loaded editor scripts are lost with this change.
2018-11-04 12:46:21 -05:00
return 0;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
XMLNode&
Editor::get_state ()
{
save/restore tabbable state
2015-07-09 12:40:51 -04:00
XMLNode* node = new XMLNode (X_("Editor"));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property ("id", id().to_s ());
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
save/restore tabbable state
2015-07-09 12:40:51 -04:00
node->add_child_nocopy (Tabbable::get_state());
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property("edit-horizontal-pane-pos", edit_pane.get_divider ());
node->set_property("notebook-shrunk", _notebook_shrunk);
node->set_property("edit-vertical-pane-pos", editor_summary_pane.get_divider());
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
save/restore tabbable state
2015-07-09 12:40:51 -04:00
maybe_add_mixer_strip_width (*node);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property ("zoom-focus", zoom_focus);
node->set_property ("zoom", samples_per_pixel);
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
node->set_property ("grid-type", _grid_type);
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property ("snap-mode", _snap_mode);
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
node->set_property ("internal-grid-type", internal_grid_type);
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property ("internal-snap-mode", internal_snap_mode);
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
node->set_property ("pre-internal-grid-type", pre_internal_grid_type);
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property ("pre-internal-snap-mode", pre_internal_snap_mode);
node->set_property ("edit-point", _edit_point);
node->set_property ("visible-track-count", _visible_track_count);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
node->set_property ("playhead", playhead_cursor->current_sample ());
node->set_property ("left-frame", _leftmost_sample);
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property ("y-origin", vertical_adjustment.get_value ());
node->set_property ("maximised", _maximised);
node->set_property ("follow-playhead", _follow_playhead);
node->set_property ("stationary-playhead", _stationary_playhead);
node->set_property ("mouse-mode", mouse_mode);
node->set_property ("join-object-range", smart_mode_action->get_active ());
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("show-editor-mixer"));
node->set_property (X_("show-editor-mixer"), tact->get_active());
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
tact = ActionManager::get_toggle_action (X_("Editor"), X_("show-editor-list"));
node->set_property (X_("show-editor-list"), tact->get_active());
remove editor mixer button, fix up editor mixer state save/restore git-svn-id: svn://localhost/trunk/ardour2@306 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-30 22:27:25 -05:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property (X_("editor-list-page"), _the_notebook.get_current_page ());
Save and restore the selected tab and its width in the editor list. git-svn-id: svn://localhost/ardour2/branches/3.0@6860 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-05 13:38:54 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
if (button_bindings) {
XMLNode* bb = new XMLNode (X_("Buttons"));
button_bindings->save (*bb);
node->add_child_nocopy (*bb);
}
basic adoption of new mouse binding facility git-svn-id: svn://localhost/ardour2/branches/3.0@9063 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-03 22:10:48 -05:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property (X_("show-marker-lines"), _show_marker_lines);
Option to show lines below markers (#3529). git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 13:29:32 -05:00
save/restore tabbable state
2015-07-09 12:40:51 -04:00
node->add_child_nocopy (selection->get_state ());
node->add_child_nocopy (_regions->get_state ());
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Use XMLNode::get/set_property API in Editor class
2016-08-26 23:44:57 -04:00
node->set_property ("nudge-clock-value", nudge_clock->current_duration());
save nudge clock value; don't reset the nudge clock mode when loading a session (possibly some finessing required here, since presumably mode and value should be per-session and are saved in the session instant.xml anyway) git-svn-id: svn://localhost/ardour2/branches/3.0@11721 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-17 10:10:44 -04:00
Save/restore location clock mode - save mode separately for Editor-sidebar and Location Window - cache mode (multiple calls to set_session()) - fix restore: after creating the editor, instant_save() is called, potentially overwriting the previous value.
2017-02-14 11:15:16 -05:00
node->add_child_nocopy (_locations->get_state ());
Editor Actions Scripts & Manager
2016-02-23 09:42:53 -05:00
save/restore tabbable state
2015-07-09 12:40:51 -04:00
return *node;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
fix problem with calls to Editor::trackview_by_y_position() when using motion events. The coordinate passed in was in canvas space and the method expected trackview space To handle any further issues like this, I generalized and added an optional argument specifying that the canvas=>trackview transform is required, thus centralizing where this done.
2014-06-08 14:41:29 -04:00
/** if @param trackview_relative_offset is true, @param y y is an offset into the trackview area, in pixel units
* if @param trackview_relative_offset is false, @param y y is a global canvas * coordinate, in pixel units
more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
2014-06-03 15:57:56 -04:00
*
Comment and (hopefully) simplify Editor::region_drag_motion_callback, fixing problems with dragging regions to and from tracks in "stacked" display mode. As a side-effect, enable dragging of regions between layers, though I'm not entirely sure where this is useful or desirable just yet; dragging regions between layers currently works in the GUI but has no effect on the model. git-svn-id: svn://localhost/ardour2/branches/3.0@4389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-05 22:18:09 -05:00
* @return pair: TimeAxisView that y is over, layer index.
more profound changes to canvas scrolling, in particular find appropriate ScrollGroup for Canvas::{window,canvas}_to_{canvas,window}()
2014-06-03 15:57:56 -04:00
*
Comment and (hopefully) simplify Editor::region_drag_motion_callback, fixing problems with dragging regions to and from tracks in "stacked" display mode. As a side-effect, enable dragging of regions between layers, though I'm not entirely sure where this is useful or desirable just yet; dragging regions between layers currently works in the GUI but has no effect on the model. git-svn-id: svn://localhost/ardour2/branches/3.0@4389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-05 22:18:09 -05:00
* TimeAxisView may be 0. Layer index is the layer number if the TimeAxisView is valid and is
Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it. git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-29 17:14:15 -05:00
* in stacked or expanded region display mode, otherwise 0.
Comment and (hopefully) simplify Editor::region_drag_motion_callback, fixing problems with dragging regions to and from tracks in "stacked" display mode. As a side-effect, enable dragging of regions between layers, though I'm not entirely sure where this is useful or desirable just yet; dragging regions between layers currently works in the GUI but has no effect on the model. git-svn-id: svn://localhost/ardour2/branches/3.0@4389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-05 22:18:09 -05:00
*/
Re-work layering in possibly debatable ways. Sketchy docs in doc/layering. git-svn-id: svn://localhost/ardour2/branches/3.0@11088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 20:42:49 -05:00
std::pair<TimeAxisView *, double>
a whole slew of changes related to centralizing and rationalizing cursor management. Debugging output left in place to help address the reports that will come in as people test this more
2014-06-18 10:24:59 -04:00
Editor::trackview_by_y_position (double y, bool trackview_relative_offset) const
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
fix problem with calls to Editor::trackview_by_y_position() when using motion events. The coordinate passed in was in canvas space and the method expected trackview space To handle any further issues like this, I generalized and added an optional argument specifying that the canvas=>trackview transform is required, thus centralizing where this done.
2014-06-08 14:41:29 -04:00
if (!trackview_relative_offset) {
y -= _trackview_group->canvas_origin().y;
}
introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group. More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-06-08 11:26:25 -04:00
if (y < 0) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
return std::make_pair ((TimeAxisView *) 0, 0);
introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group. More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-06-08 11:26:25 -04:00
}
fix problem with calls to Editor::trackview_by_y_position() when using motion events. The coordinate passed in was in canvas space and the method expected trackview space To handle any further issues like this, I generalized and added an optional argument specifying that the canvas=>trackview transform is required, thus centralizing where this done.
2014-06-08 14:41:29 -04:00
a whole slew of changes related to centralizing and rationalizing cursor management. Debugging output left in place to help address the reports that will come in as people test this more
2014-06-18 10:24:59 -04:00
for (TrackViewList::const_iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group. More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-06-08 11:26:25 -04:00
std::pair<TimeAxisView*, double> const r = (*iter)->covers_y_position (y);
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
introduce Drag::_trackview_only which indicates that all y-axis positions for the pointer during a drag should be relative to the top of the trackview group. More or less all drags except for Cursor (playhead) and drags in the range marker bars have this true (which is the default value)
2014-06-08 11:26:25 -04:00
if (r.first) {
return r;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
fix problem with calls to Editor::trackview_by_y_position() when using motion events. The coordinate passed in was in canvas space and the method expected trackview space To handle any further issues like this, I generalized and added an optional argument specifying that the canvas=>trackview transform is required, thus centralizing where this done.
2014-06-08 14:41:29 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
return std::make_pair ((TimeAxisView *) 0, 0);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
void
Editor::set_snapped_cursor_position (samplepos_t pos)
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (_edit_point == EditAtMouse) {
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
snapped_cursor->set_position(pos);
}
}
Alter snap modifier so that it turns the grid on when it's off as well as vice-versa. git-svn-id: svn://localhost/ardour2/branches/3.0@5584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-24 16:26:34 -04:00
/** Snap a position to the grid, if appropriate, taking into account current
* grid settings and also the state of any snap modifier keys that may be pressed.
* @param start Position to snap.
Refactor and clean up some confusion in dragging code. git-svn-id: svn://localhost/ardour2/branches/3.0@6384 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 20:12:41 -05:00
* @param event Event to get current key modifier information from, or 0.
Alter snap modifier so that it turns the grid on when it's off as well as vice-versa. git-svn-id: svn://localhost/ardour2/branches/3.0@5584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-24 16:26:34 -04:00
*/
void
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
Editor::snap_to_with_modifier (MusicSample& start, GdkEvent const * event, RoundMode direction, SnapPref pref)
Alter snap modifier so that it turns the grid on when it's off as well as vice-versa. git-svn-id: svn://localhost/ardour2/branches/3.0@5584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-24 16:26:34 -04:00
{
Refactor and clean up some confusion in dragging code. git-svn-id: svn://localhost/ardour2/branches/3.0@6384 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 20:12:41 -05:00
if (!_session || !event) {
Alter snap modifier so that it turns the grid on when it's off as well as vice-versa. git-svn-id: svn://localhost/ardour2/branches/3.0@5584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-24 16:26:34 -04:00
return;
}
Fix up modifier behaviour - its now possible to use snap modifiers in combination with others afaict this hasn't worked for some time. - use "contains" rather than "equals" during drag. Still uncertain about this wrt beginning a drag. for now they are all "equals". - probably solve the "snap modifier modifier" problem using ArdourKeyboard::indicates_snap () and friend.
2015-05-21 12:12:58 -04:00
if (ArdourKeyboard::indicates_snap (event->button.state)) {
provide accessors to Editor::snap_{type,mode} ; when nudging notes, use grid in preference to nudge clock git-svn-id: svn://localhost/ardour2/branches/3.0@5934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 19:43:04 -04:00
if (_snap_mode == SnapOff) {
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
snap_to_internal (start, direction, pref);
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
} else {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
start.set (start.sample, 0);
Alter snap modifier so that it turns the grid on when it's off as well as vice-versa. git-svn-id: svn://localhost/ardour2/branches/3.0@5584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-24 16:26:34 -04:00
}
} else {
provide accessors to Editor::snap_{type,mode} ; when nudging notes, use grid in preference to nudge clock git-svn-id: svn://localhost/ardour2/branches/3.0@5934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 19:43:04 -04:00
if (_snap_mode != SnapOff) {
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
snap_to_internal (start, direction, pref);
Fix inverted logic of SnapOff with snap modifiers pressed. - also clean up, rename and comment some previous hanges.
2015-05-22 13:09:48 -04:00
} else if (ArdourKeyboard::indicates_snap_delta (event->button.state)) {
/* SnapOff, but we pressed the snap_delta modifier */
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
snap_to_internal (start, direction, pref);
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
} else {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
start.set (start.sample, 0);
Alter snap modifier so that it turns the grid on when it's off as well as vice-versa. git-svn-id: svn://localhost/ardour2/branches/3.0@5584 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-24 16:26:34 -04:00
}
}
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
Editor::snap_to (MusicSample& start, RoundMode direction, SnapPref pref, bool ensure_snap)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
Fix inverted logic of SnapOff with snap modifiers pressed. - also clean up, rename and comment some previous hanges.
2015-05-22 13:09:48 -04:00
if (!_session || (_snap_mode == SnapOff && !ensure_snap)) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
start.set (start.sample, 0);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
return;
}
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
snap_to_internal (start, direction, pref, ensure_snap);
Relative snap - support magnetic mode (hackishly for now)
2015-05-16 14:26:05 -04:00
}
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
static void
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
check_best_snap (samplepos_t presnap, samplepos_t &test, samplepos_t &dist, samplepos_t &best)
Merge with 2.0-ongoing R3082. Superficial generification of export stuff. git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 17:10:27 -05:00
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
samplepos_t diff = abs (test - presnap);
if (diff < dist) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
dist = diff;
best = test;
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 10:38:58 -04:00
}
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
test = max_samplepos; // reset this so it doesn't get accidentally reused
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 10:38:58 -04:00
}
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
MusicSample
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
Editor::snap_to_timecode (MusicSample presnap, RoundMode direction, SnapPref gpref)
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 10:38:58 -04:00
{
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
samplepos_t start = presnap.sample;
const samplepos_t one_timecode_second = (samplepos_t)(rint(_session->timecode_frames_per_second()) * _session->samples_per_timecode_frame());
samplepos_t one_timecode_minute = (samplepos_t)(rint(_session->timecode_frames_per_second()) * _session->samples_per_timecode_frame() * 60);
Fix potential crash in snap_to_grid (grid-mark list is empty).
2018-02-11 13:05:23 -05:00
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
TimecodeRulerScale scale = (gpref != SnapToGrid_Unscaled) ? timecode_ruler_scale : timecode_show_samples;
change the use of "SMPTE" to "Timecode" to reflect the global economy and the end of american dominance on the world audio production stage git-svn-id: svn://localhost/ardour2/branches/3.0@5924 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-26 10:38:58 -04:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
switch (scale) {
case timecode_show_bits:
case timecode_show_samples:
if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
fmod((double)start, (double)_session->samples_per_timecode_frame()) == 0) {
/* start is already on a whole timecode frame, do nothing */
} else if (((direction == 0) && (fmod((double)start, (double)_session->samples_per_timecode_frame()) > (_session->samples_per_timecode_frame() / 2))) || (direction > 0)) {
start = (samplepos_t) (ceil ((double) start / _session->samples_per_timecode_frame()) * _session->samples_per_timecode_frame());
} else {
start = (samplepos_t) (floor ((double) start / _session->samples_per_timecode_frame()) * _session->samples_per_timecode_frame());
}
break;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
case timecode_show_seconds:
if (_session->config.get_timecode_offset_negative()) {
start += _session->config.get_timecode_offset ();
} else {
start -= _session->config.get_timecode_offset ();
}
if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
(start % one_timecode_second == 0)) {
/* start is already on a whole second, do nothing */
} else if (((direction == 0) && (start % one_timecode_second > one_timecode_second / 2)) || direction > 0) {
start = (samplepos_t) ceil ((double) start / one_timecode_second) * one_timecode_second;
} else {
start = (samplepos_t) floor ((double) start / one_timecode_second) * one_timecode_second;
}
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
if (_session->config.get_timecode_offset_negative()) {
start -= _session->config.get_timecode_offset ();
} else {
start += _session->config.get_timecode_offset ();
}
break;
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
case timecode_show_minutes:
case timecode_show_hours:
case timecode_show_many_hours:
if (_session->config.get_timecode_offset_negative()) {
start += _session->config.get_timecode_offset ();
} else {
start -= _session->config.get_timecode_offset ();
}
if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
(start % one_timecode_minute == 0)) {
/* start is already on a whole minute, do nothing */
} else if (((direction == 0) && (start % one_timecode_minute > one_timecode_minute / 2)) || direction > 0) {
start = (samplepos_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute;
} else {
start = (samplepos_t) floor ((double) start / one_timecode_minute) * one_timecode_minute;
}
if (_session->config.get_timecode_offset_negative()) {
start -= _session->config.get_timecode_offset ();
} else {
start += _session->config.get_timecode_offset ();
}
break;
default:
fatal << "Editor::smpte_snap_to_internal() called with non-timecode snap type!" << endmsg;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
MusicSample ret(start,0);
return ret;
}
MusicSample
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
Editor::snap_to_minsec (MusicSample presnap, RoundMode direction, SnapPref gpref)
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
{
MusicSample ret(presnap);
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
const samplepos_t one_second = _session->sample_rate();
const samplepos_t one_minute = one_second * 60;
const samplepos_t one_hour = one_minute * 60;
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
MinsecRulerScale scale = (gpref != SnapToGrid_Unscaled) ? minsec_ruler_scale : minsec_show_seconds;
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
switch (scale) {
case minsec_show_msecs:
case minsec_show_seconds: {
if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
presnap.sample % one_second == 0) {
/* start is already on a whole second, do nothing */
} else if (((direction == 0) && (presnap.sample % one_second > one_second / 2)) || (direction > 0)) {
ret.sample = (samplepos_t) ceil ((double) presnap.sample / one_second) * one_second;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
} else {
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
ret.sample = (samplepos_t) floor ((double) presnap.sample / one_second) * one_second;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
} break;
case minsec_show_minutes: {
if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
presnap.sample % one_minute == 0) {
/* start is already on a whole minute, do nothing */
} else if (((direction == 0) && (presnap.sample % one_minute > one_minute / 2)) || (direction > 0)) {
ret.sample = (samplepos_t) ceil ((double) presnap.sample / one_minute) * one_minute;
} else {
ret.sample = (samplepos_t) floor ((double) presnap.sample / one_minute) * one_minute;
}
} break;
default: {
if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
presnap.sample % one_hour == 0) {
/* start is already on a whole hour, do nothing */
} else if (((direction == 0) && (presnap.sample % one_hour > one_hour / 2)) || (direction > 0)) {
ret.sample = (samplepos_t) ceil ((double) presnap.sample / one_hour) * one_hour;
} else {
ret.sample = (samplepos_t) floor ((double) presnap.sample / one_hour) * one_hour;
}
} break;
}
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
return ret;
}
MusicSample
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
Editor::snap_to_cd_frames (MusicSample presnap, RoundMode direction, SnapPref gpref)
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
{
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
if ((gpref != SnapToGrid_Unscaled) && (minsec_ruler_scale != minsec_show_msecs)) {
return snap_to_minsec (presnap, direction, gpref);
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
}
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
const samplepos_t one_second = _session->sample_rate();
MusicSample ret(presnap);
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
presnap.sample % (one_second/75) == 0) {
/* start is already on a whole CD sample, do nothing */
} else if (((direction == 0) && (presnap.sample % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) {
ret.sample = (samplepos_t) ceil ((double) presnap.sample / (one_second / 75)) * (one_second / 75);
} else {
ret.sample = (samplepos_t) floor ((double) presnap.sample / (one_second / 75)) * (one_second / 75);
}
return ret;
}
MusicSample
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
Editor::snap_to_bbt (MusicSample presnap, RoundMode direction, SnapPref gpref)
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
{
MusicSample ret(presnap);
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
if (gpref != SnapToGrid_Unscaled) { // use the visual grid lines which are limited by the zoom scale that the user selected
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
int divisor = 2;
switch (_grid_type) {
case GridTypeBeatDiv3:
case GridTypeBeatDiv6:
case GridTypeBeatDiv12:
case GridTypeBeatDiv24:
divisor = 3;
break;
case GridTypeBeatDiv5:
case GridTypeBeatDiv10:
case GridTypeBeatDiv20:
divisor = 5;
break;
case GridTypeBeatDiv7:
case GridTypeBeatDiv14:
case GridTypeBeatDiv28:
divisor = 7;
break;
default:
divisor = 2;
};
BBTRulerScale scale = bbt_ruler_scale;
switch (scale) {
case bbt_show_many:
case bbt_show_64:
case bbt_show_16:
case bbt_show_4:
case bbt_show_1:
ret = _session->tempo_map().round_to_bar (presnap.sample, direction);
break;
case bbt_show_quarters:
ret = _session->tempo_map().round_to_beat (presnap.sample, direction);
break;
case bbt_show_eighths:
ret = _session->tempo_map().round_to_quarter_note_subdivision (presnap.sample, 1 * divisor, direction);
break;
case bbt_show_sixteenths:
ret = _session->tempo_map().round_to_quarter_note_subdivision (presnap.sample, 2 * divisor, direction);
break;
case bbt_show_thirtyseconds:
ret = _session->tempo_map().round_to_quarter_note_subdivision (presnap.sample, 4 * divisor, direction);
break;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
} else {
ret = _session->tempo_map().round_to_quarter_note_subdivision (presnap.sample, get_grid_beat_divisions(_grid_type), direction);
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
return ret;
}
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
ARDOUR::MusicSample
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
Editor::snap_to_grid (MusicSample presnap, RoundMode direction, SnapPref gpref)
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
{
MusicSample ret(presnap);
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
if (grid_musical()) {
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
ret = snap_to_bbt (presnap, direction, gpref);
}
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
switch (_grid_type) {
case GridTypeTimecode:
ret = snap_to_timecode(presnap, direction, gpref);
break;
case GridTypeMinSec:
ret = snap_to_minsec(presnap, direction, gpref);
break;
case GridTypeCDFrame:
ret = snap_to_cd_frames(presnap, direction, gpref);
break;
default:
{}
};
return ret;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
samplepos_t
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
Editor::snap_to_marker (samplepos_t presnap, RoundMode direction)
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
{
samplepos_t before;
samplepos_t after;
samplepos_t test;
Grid: explicitly check for empty marker list (fixes: grid fails if no start+end markers yet)
2020-03-28 09:10:36 -04:00
if (_session->locations()->list().empty()) {
/* No marks to snap to, so just don't snap */
Fix snap if there are no locations - amend 4a036a2da
2020-03-30 12:16:09 -04:00
return 0;
Grid: explicitly check for empty marker list (fixes: grid fails if no start+end markers yet)
2020-03-28 09:10:36 -04:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
_session->locations()->marks_either_side (presnap, before, after);
Grid: explicitly check for empty marker list (fixes: grid fails if no start+end markers yet)
2020-03-28 09:10:36 -04:00
if (before == max_samplepos) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
test = after;
} else if (after == max_samplepos) {
test = before;
} else {
if ((direction == RoundUpMaybe || direction == RoundUpAlways)) {
test = after;
} else if ((direction == RoundDownMaybe || direction == RoundDownAlways)) {
test = before;
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
} else if (direction == 0) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
if ((presnap - before) < (after - presnap)) {
test = before;
} else {
test = after;
}
}
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
return test;
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
void
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
Editor::snap_to_internal (MusicSample& start, RoundMode direction, SnapPref pref, bool ensure_snap)
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
{
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
UIConfiguration const& uic (UIConfiguration::instance ());
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
const samplepos_t presnap = start.sample;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
samplepos_t test = max_samplepos; // for each snap, we'll use this value
samplepos_t dist = max_samplepos; // this records the distance of the best snap result we've found so far
samplepos_t best = max_samplepos; // this records the best snap-result we've found so far
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* check snap-to-marker */
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
if ((pref == SnapToAny_Visual) && uic.get_snap_to_marks ()) {
new_grid: The Return of the snap_to_X functions. We no longer assume that Snap always uses the visible ruler lines. If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
2018-07-26 15:23:59 -04:00
test = snap_to_marker (presnap, direction);
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
check_best_snap (presnap, test, dist, best);
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* check snap-to-region-{start/end/sync} */
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
if ((pref == SnapToAny_Visual) && (uic.get_snap_to_region_start () || uic.get_snap_to_region_end () || uic.get_snap_to_region_sync ())) {
use const ref to UIConfiguration::instance() to shorten lines a bit
2020-03-30 19:21:39 -04:00
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
if (!region_boundary_cache.empty ()) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
vector<samplepos_t>::iterator prev = region_boundary_cache.begin ();
vector<samplepos_t>::iterator next = std::upper_bound (region_boundary_cache.begin (), region_boundary_cache.end (), presnap);
Fix remainder of bug 1605 so that when snapping to region starts / ends, the crossover between the current snap and the next one happens halfway between the two. git-svn-id: svn://localhost/ardour2/branches/3.0@5568 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-22 15:45:40 -04:00
if (next != region_boundary_cache.begin ()) {
prev = next;
prev--;
}
Fix region boundary cache lookup segfault When the cursor position is after the last item in the vector, upper_bound returns the last given iterator, here: `region_boundary_cache.end()`, which is invalid to dereference. Furthermore prevent possible duplicate prev/next pair at zero, when using the video-timelime.
2020-04-22 16:37:43 -04:00
if (next == region_boundary_cache.end ()) {
next--;
}
Merge with 2.0-ongoing R3082. Superficial generification of export stuff. git-svn-id: svn://localhost/ardour2/branches/3.0@3088 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-19 17:10:27 -05:00
add braces as per coding guide
2020-03-30 19:21:57 -04:00
if ((direction == RoundUpMaybe || direction == RoundUpAlways)) {
Replace the check for SnapPref, which went missing. Some functions (like playhead_to_next_grid) can request GridOnly.
2018-05-02 17:37:14 -04:00
test = *next;
add braces as per coding guide
2020-03-30 19:21:57 -04:00
} else if ((direction == RoundDownMaybe || direction == RoundDownAlways)) {
Replace the check for SnapPref, which went missing. Some functions (like playhead_to_next_grid) can request GridOnly.
2018-05-02 17:37:14 -04:00
test = *prev;
add braces as per coding guide
2020-03-30 19:21:57 -04:00
} else if (direction == 0) {
Replace the check for SnapPref, which went missing. Some functions (like playhead_to_next_grid) can request GridOnly.
2018-05-02 17:37:14 -04:00
if ((presnap - *prev) < (*next - presnap)) {
test = *prev;
} else {
test = *next;
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Revert frame -> sample changes where it's a frame as in Gtk::Frame
2018-06-09 13:08:15 -04:00
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
check_best_snap (presnap, test, dist, best);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* check Grid */
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
if (uic.get_snap_to_grid () && (_grid_type != GridTypeNone)) {
MusicSample pre (presnap, 0);
NO-OP: clean up whitespace, separate methods
2018-07-26 18:25:01 -04:00
MusicSample post = snap_to_grid (pre, direction, pref);
NO-OP: cleanup snap-to code, mostly whitespace
2020-04-05 14:08:33 -04:00
check_best_snap (presnap, post.sample, dist, best);
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Simplify snap-to magnetic distance calc
2020-04-05 14:09:42 -04:00
if (max_samplepos == best) {
return;
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* now check "magnetic" state: is the grid within reasonable on-screen distance to trigger a snap?
* this also helps to avoid snapping to somewhere the user can't see. (i.e.: I clicked on a region and it disappeared!!)
* ToDo: Perhaps this should only occur if EditPointMouse?
*/
Simplify snap-to magnetic distance calc
2020-04-05 14:09:42 -04:00
samplecnt_t snap_threshold_s = pixel_to_sample (uic.get_snap_threshold ());
if (!ensure_snap && ::llabs (presnap - best) > snap_threshold_s) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
return;
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
start.set (best, 0);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Genericificationalizeified AudioFilter (now Filter). Added primitive (non-undoable, placeholder, etc) quantization. git-svn-id: svn://localhost/ardour2/trunk@2254 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-08-06 01:30:18 -04:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Editor::setup_toolbar ()
{
Complete edit toolbar overhaul git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 04:03:43 -04:00
HBox* mode_box = manage(new HBox);
mode_box->set_border_width (2);
reduce space around TearOff Tickmarks
2014-07-09 15:32:13 -04:00
mode_box->set_spacing(2);
First cut of some Pro-tools inspired editing features; linked play/play range and linked object/range modes. git-svn-id: svn://localhost/ardour2/branches/3.0@6431 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-01 17:11:15 -05:00
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
HBox* mouse_mode_box = manage (new HBox);
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
HBox* mouse_mode_hbox = manage (new HBox);
VBox* mouse_mode_vbox = manage (new VBox);
Alignment* mouse_mode_align = manage (new Alignment);
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
remove arbitrary button sizing for edit mode buttons
2014-09-08 16:02:16 -04:00
Glib::RefPtr<SizeGroup> mouse_mode_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL);
mouse_mode_size_group->add_widget (smart_mode_button);
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
mouse_mode_size_group->add_widget (mouse_move_button);
Allow the Cut tool to appear in Mixbus.
2019-09-29 11:11:43 -04:00
mouse_mode_size_group->add_widget (mouse_cut_button);
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
mouse_mode_size_group->add_widget (mouse_select_button);
mouse_mode_size_group->add_widget (mouse_timefx_button);
Backport Mixbus toolbutton layout
2019-04-08 21:16:09 -04:00
if (!Profile->get_mixbus()) {
mouse_mode_size_group->add_widget (mouse_audition_button);
}
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
mouse_mode_size_group->add_widget (mouse_draw_button);
Remove internal edit mode and add "content" tool.
2014-12-08 23:00:00 -05:00
mouse_mode_size_group->add_widget (mouse_content_button);
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
Fix Mixbus Editor-toolbar icons & height
2016-12-20 12:48:02 -05:00
if (!Profile->get_mixbus()) {
mouse_mode_size_group->add_widget (zoom_in_button);
mouse_mode_size_group->add_widget (zoom_out_button);
mouse_mode_size_group->add_widget (zoom_out_full_button);
mouse_mode_size_group->add_widget (zoom_focus_selector);
mouse_mode_size_group->add_widget (tav_shrink_button);
mouse_mode_size_group->add_widget (tav_expand_button);
Fix Ardour Editor-button height
2016-12-20 13:01:59 -05:00
} else {
mouse_mode_size_group->add_widget (zoom_preset_selector);
mouse_mode_size_group->add_widget (visible_tracks_selector);
Fix Mixbus Editor-toolbar icons & height
2016-12-20 12:48:02 -05:00
}
complete list from 68f0694ac0
2014-09-08 19:24:17 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
mouse_mode_size_group->add_widget (grid_type_selector);
mouse_mode_size_group->add_widget (snap_mode_button);
complete list from 68f0694ac0
2014-09-08 19:24:17 -04:00
mouse_mode_size_group->add_widget (edit_point_selector);
mouse_mode_size_group->add_widget (edit_mode_selector);
mouse_mode_size_group->add_widget (*nudge_clock);
mouse_mode_size_group->add_widget (nudge_forward_button);
mouse_mode_size_group->add_widget (nudge_backward_button);
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
mouse_mode_hbox->set_spacing (2);
goodbye Profile->...trx
2019-09-25 15:02:31 -04:00
mouse_mode_hbox->pack_start (smart_mode_button, false, false);
first pass hiding/rearrangement of UI elements related to trx
2014-04-10 13:30:25 -04:00
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
mouse_mode_hbox->pack_start (mouse_move_button, false, false);
mouse_mode_hbox->pack_start (mouse_select_button, false, false);
(Mixbus profile only) tentatively remove the Zoom and Cut tools, to save space in the toolbar and reduce some highly redundant functions
2014-07-11 16:41:28 -04:00
Allow the Cut tool to appear in Mixbus.
2019-09-29 11:11:43 -04:00
mouse_mode_hbox->pack_start (mouse_cut_button, false, false);
(Mixbus profile only) tentatively remove the Zoom and Cut tools, to save space in the toolbar and reduce some highly redundant functions
2014-07-11 16:41:28 -04:00
if (!ARDOUR::Profile->get_mixbus()) {
SoloSelection: gui part.
2018-02-11 10:39:45 -05:00
mouse_mode_hbox->pack_start (mouse_audition_button, false, false);
(Mixbus profile only) tentatively remove the Zoom and Cut tools, to save space in the toolbar and reduce some highly redundant functions
2014-07-11 16:41:28 -04:00
}
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
goodbye Profile->...trx
2019-09-25 15:02:31 -04:00
mouse_mode_hbox->pack_start (mouse_timefx_button, false, false);
mouse_mode_hbox->pack_start (mouse_draw_button, false, false);
mouse_mode_hbox->pack_start (mouse_content_button, false, false);
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
mouse_mode_vbox->pack_start (*mouse_mode_hbox);
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
mouse_mode_align->add (*mouse_mode_vbox);
mouse_mode_align->set (0.5, 1.0, 0.0, 0.0);
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
mouse_mode_box->pack_start (*mouse_mode_align, false, false);
Move object+range button up with the rest of the tool buttons (bringing edit toolbar back to correct height). git-svn-id: svn://localhost/ardour2/branches/3.0@6660 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-08 22:17:02 -05:00
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
edit_mode_selector.set_name ("mouse mode button");
Complete edit toolbar overhaul git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 04:03:43 -04:00
goodbye Profile->...trx
2019-09-25 15:02:31 -04:00
mode_box->pack_start (edit_mode_selector, false, false);
mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
mode_box->pack_start (edit_point_selector, false, false);
mode_box->pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
use button joiner for smart mode; polish up the visuals on the joiner a bit git-svn-id: svn://localhost/ardour2/branches/3.0@11439 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-03 13:31:10 -05:00
mode_box->pack_start (*mouse_mode_box, false, false);
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
Complete edit toolbar overhaul git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 04:03:43 -04:00
/* Zoom */
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
tweak up spacing+sizing in editor toolbar git-svn-id: svn://localhost/ardour2/branches/3.0@10551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-11 12:35:22 -05:00
_zoom_box.set_spacing (2);
_zoom_box.set_border_width (2);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
ardour-button-ize zoom buttons; move MIDI panic button to transport bar git-svn-id: svn://localhost/ardour2/branches/3.0@10528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 13:04:34 -05:00
RefPtr<Action> act;
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
zoom_preset_selector.set_name ("zoom button");
Fix Mixbus Editor-toolbar icons & height
2016-12-20 12:48:02 -05:00
zoom_preset_selector.set_icon (ArdourIcon::ZoomExpand);
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
brownish zoom buttons
2014-03-25 07:35:41 -04:00
zoom_in_button.set_name ("zoom button");
use vectorized zoom icons instead of pixmaps.
2015-05-24 17:10:02 -04:00
zoom_in_button.set_icon (ArdourIcon::ZoomIn);
ardour-button-ize zoom buttons; move MIDI panic button to transport bar git-svn-id: svn://localhost/ardour2/branches/3.0@10528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 13:04:34 -05:00
act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-in"));
several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 15:48:44 -05:00
zoom_in_button.set_related_action (act);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
brownish zoom buttons
2014-03-25 07:35:41 -04:00
zoom_out_button.set_name ("zoom button");
use vectorized zoom icons instead of pixmaps.
2015-05-24 17:10:02 -04:00
zoom_out_button.set_icon (ArdourIcon::ZoomOut);
ardour-button-ize zoom buttons; move MIDI panic button to transport bar git-svn-id: svn://localhost/ardour2/branches/3.0@10528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 13:04:34 -05:00
act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-out"));
several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 15:48:44 -05:00
zoom_out_button.set_related_action (act);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
brownish zoom buttons
2014-03-25 07:35:41 -04:00
zoom_out_full_button.set_name ("zoom button");
use vectorized zoom icons instead of pixmaps.
2015-05-24 17:10:02 -04:00
zoom_out_full_button.set_icon (ArdourIcon::ZoomFull);
ardour-button-ize zoom buttons; move MIDI panic button to transport bar git-svn-id: svn://localhost/ardour2/branches/3.0@10528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-10 13:04:34 -05:00
act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session"));
several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 15:48:44 -05:00
zoom_out_full_button.set_related_action (act);
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
brownish zoom buttons
2014-03-25 07:35:41 -04:00
zoom_focus_selector.set_name ("zoom button");
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
add mixbus profile which removes the tearoffs
2014-07-09 16:11:58 -04:00
if (ARDOUR::Profile->get_mixbus()) {
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
_zoom_box.pack_start (zoom_preset_selector, false, false);
add mixbus profile which removes the tearoffs
2014-07-09 16:11:58 -04:00
} else {
_zoom_box.pack_start (zoom_out_button, false, false);
_zoom_box.pack_start (zoom_in_button, false, false);
_zoom_box.pack_start (zoom_out_full_button, false, false);
_zoom_box.pack_start (zoom_focus_selector, false, false);
first pass hiding/rearrangement of UI elements related to trx
2014-04-10 13:30:25 -04:00
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Patch from lincoln to add track resize buttons to the top-left corner of the editor (underneath the zoom buttons). Mantis 2768. git-svn-id: svn://localhost/ardour2/branches/3.0@5587 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-24 18:28:00 -04:00
/* Track zoom buttons */
repack widgets, and add some spacer elements
2016-12-18 14:29:19 -05:00
_track_box.set_spacing (2);
_track_box.set_border_width (2);
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
visible_tracks_selector.set_name ("zoom button");
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
if (Profile->get_mixbus()) {
Fix Mixbus Editor-toolbar icons & height
2016-12-20 12:48:02 -05:00
visible_tracks_selector.set_icon (ArdourIcon::TimeAxisExpand);
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
} else {
Shrink minimum width a bit by using the same hpad for all toolbar selectors. 30 was already being used for some, and looks like more than enough padding, for me. Hopefully is enough everywhere.
2014-07-29 23:44:57 -04:00
set_size_request_to_display_given_text (visible_tracks_selector, _("All"), 30, 2);
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
}
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
add back track shrink/expand buttons
2014-03-25 10:43:04 -04:00
tav_expand_button.set_name ("zoom button");
use vectorized TAV expand/shrink icons
2015-05-24 18:26:09 -04:00
tav_expand_button.set_icon (ArdourIcon::TimeAxisExpand);
add back track shrink/expand buttons
2014-03-25 10:43:04 -04:00
act = ActionManager::get_action (X_("Editor"), X_("expand-tracks"));
tav_expand_button.set_related_action (act);
tav_shrink_button.set_name ("zoom button");
use vectorized TAV expand/shrink icons
2015-05-24 18:26:09 -04:00
tav_shrink_button.set_icon (ArdourIcon::TimeAxisShrink);
add back track shrink/expand buttons
2014-03-25 10:43:04 -04:00
act = ActionManager::get_action (X_("Editor"), X_("shrink-tracks"));
tav_shrink_button.set_related_action (act);
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
if (ARDOUR::Profile->get_mixbus()) {
repack widgets, and add some spacer elements
2016-12-18 14:29:19 -05:00
_track_box.pack_start (visible_tracks_selector);
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
} else {
repack widgets, and add some spacer elements
2016-12-18 14:29:19 -05:00
_track_box.pack_start (visible_tracks_selector);
_track_box.pack_start (tav_shrink_button);
_track_box.pack_start (tav_expand_button);
first pass hiding/rearrangement of UI elements related to trx
2014-04-10 13:30:25 -04:00
}
add back track shrink/expand buttons
2014-03-25 10:43:04 -04:00
several theme changes. changed drawing of rounded_rectangle to be more correct. operation and feel should be more consistent. rec-mute-solo buttons are now dull until enabled. this might be debatable. otherwise if it looks weird, try loading Window->Theme Manager and clicking Restore Defaults git-svn-id: svn://localhost/ardour2/branches/3.0@13611 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 15:48:44 -05:00
snap_box.set_spacing (2);
Complete edit toolbar overhaul git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 04:03:43 -04:00
snap_box.set_border_width (2);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
grid_type_selector.set_name ("mouse mode button");
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
snap_mode_button.set_name ("mouse mode button");
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
edit_point_selector.set_name ("mouse mode button");
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
snap_box.pack_start (snap_mode_button, false, false);
snap_box.pack_start (grid_type_selector, false, false);
repack widgets, and add some spacer elements
2016-12-18 14:29:19 -05:00
More toolbar tweaking - Ardour fits on 1024x768! git-svn-id: svn://localhost/ardour2/branches/midi@659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 13:15:45 -04:00
/* Nudge */
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
More toolbar tweaking - Ardour fits on 1024x768! git-svn-id: svn://localhost/ardour2/branches/midi@659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 13:15:45 -04:00
HBox *nudge_box = manage (new HBox);
tweak up spacing+sizing in editor toolbar git-svn-id: svn://localhost/ardour2/branches/3.0@10551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-11 12:35:22 -05:00
nudge_box->set_spacing (2);
More toolbar tweaking - Ardour fits on 1024x768! git-svn-id: svn://localhost/ardour2/branches/midi@659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 13:15:45 -04:00
nudge_box->set_border_width (2);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
nudge_forward_button.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::nudge_forward_release), false);
nudge_backward_button.signal_button_release_event().connect (sigc::mem_fun(*this, &Editor::nudge_backward_release), false);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
More toolbar tweaking - Ardour fits on 1024x768! git-svn-id: svn://localhost/ardour2/branches/midi@659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 13:15:45 -04:00
nudge_box->pack_start (nudge_backward_button, false, false);
nudge_box->pack_start (nudge_forward_button, false, false);
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 13:50:37 -04:00
nudge_box->pack_start (*nudge_clock, false, false);
a metric ton of changes git-svn-id: svn://localhost/trunk/ardour2@246 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-07 21:56:49 -05:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
More toolbar tweaking - Ardour fits on 1024x768! git-svn-id: svn://localhost/ardour2/branches/midi@659 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 13:15:45 -04:00
/* Pack everything in... */
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
reduce space around TearOff Tickmarks
2014-07-09 15:32:13 -04:00
toolbar_hbox.set_spacing (2);
Transport Layout: * Remove some redundant containers and frames, for a cleaner look. * Adjust transport button spacing and sizes to more closely match the editor toolbar.
2016-12-18 10:02:13 -05:00
toolbar_hbox.set_border_width (2);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
ArdourWidgets::ArdourDropShadow *tool_shadow = manage (new (ArdourWidgets::ArdourDropShadow));
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
tool_shadow->set_size_request (4, -1);
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
tool_shadow->show();
ebox_hpacker.pack_start (*tool_shadow, false, false);
ebox_hpacker.pack_start(ebox_vpacker, true, true);
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
Gtk::EventBox* spacer = manage (new Gtk::EventBox); // extra space under the mouse toolbar, for aesthetics
Add drop-shadow decorators to menu bar and transport toolbar. Allow status bar to fill available width.
2018-02-19 09:05:55 -05:00
spacer->set_name("EditorWindow");
spacer->set_size_request(-1,4);
spacer->show();
ebox_vpacker.pack_start(toolbar_hbox, false, false);
ebox_vpacker.pack_start(*spacer, false, false);
ebox_vpacker.show();
remove all tearoffs except the monitor section. We don't need this functionality anymore as we build on 15 years experience plus the new tabbed structure
2015-07-27 18:05:42 -04:00
toolbar_hbox.pack_start (*mode_box, false, false);
goodbye Profile->...trx
2019-09-25 15:02:31 -04:00
toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
toolbar_hbox.pack_start (snap_box, false, false);
toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
toolbar_hbox.pack_start (*nudge_box, false, false);
toolbar_hbox.pack_end (_zoom_box, false, false, 2);
toolbar_hbox.pack_end (*(manage (new ArdourVSpacer ())), false, false, 3);
toolbar_hbox.pack_end (_track_box, false, false);
Complete edit toolbar overhaul git-svn-id: svn://localhost/ardour2/branches/midi@657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-06-30 04:03:43 -04:00
repack widgets, and add some spacer elements
2016-12-18 14:29:19 -05:00
toolbar_hbox.show_all ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
void
Editor::build_edit_point_menu ()
{
using namespace Menu_Helpers;
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
edit_point_selector.AddMenuElem (MenuElem (edit_point_strings[(int)EditAtPlayhead], sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_selection_done), (EditPoint) EditAtPlayhead)));
remove EditAtSelectedMarker for Mixbus, to match mb2. (also fix an existing thinko in the edit point selection actions) (oops: also fix previous track selection fix so that it pays attention to the selection property of the group)
2014-07-09 17:33:48 -04:00
if(!Profile->get_mixbus())
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
edit_point_selector.AddMenuElem (MenuElem (edit_point_strings[(int)EditAtSelectedMarker], sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_selection_done), (EditPoint) EditAtSelectedMarker)));
edit_point_selector.AddMenuElem (MenuElem (edit_point_strings[(int)EditAtMouse], sigc::bind (sigc::mem_fun(*this, &Editor::edit_point_selection_done), (EditPoint) EditAtMouse)));
add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings
2014-07-09 16:48:19 -04:00
update dropdown triangle
2014-08-30 12:26:03 -04:00
set_size_request_to_display_given_text (edit_point_selector, edit_point_strings, COMBO_TRIANGLE_WIDTH, 2);
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
}
void
Editor::build_edit_mode_menu ()
{
using namespace Menu_Helpers;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
edit_mode_selector.AddMenuElem (MenuElem (edit_mode_strings[(int)Slide], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Slide)));
edit_mode_selector.AddMenuElem (MenuElem (edit_mode_strings[(int)Ripple], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Ripple)));
edit_mode_selector.AddMenuElem (MenuElem (edit_mode_strings[(int)Lock], sigc::bind (sigc::mem_fun(*this, &Editor::edit_mode_selection_done), (EditMode) Lock)));
/* Note: Splice was removed */
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
update dropdown triangle
2014-08-30 12:26:03 -04:00
set_size_request_to_display_given_text (edit_mode_selector, edit_mode_strings, COMBO_TRIANGLE_WIDTH, 2);
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
}
void
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
Editor::build_grid_type_menu ()
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
{
using namespace Menu_Helpers;
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* main grid: bars, quarter-notes, etc */
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeNone], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeNone)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBar], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBar)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeat], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeat)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeatDiv2], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv2)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeatDiv4], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv4)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeatDiv8], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv8)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeatDiv16], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv16)));
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeBeatDiv32], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv32)));
/* triplet grid */
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
grid_type_selector.AddMenuElem(SeparatorElem());
Gtk::Menu *_triplet_menu = manage (new Menu);
MenuList& triplet_items (_triplet_menu->items());
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
triplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv3], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv3)));
triplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv6], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv6)));
triplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv12], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv12)));
triplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv24], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv24)));
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
grid_type_selector.AddMenuElem (Menu_Helpers::MenuElem (_("Triplets"), *_triplet_menu));
add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings
2014-07-09 16:48:19 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* quintuplet grid */
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
Gtk::Menu *_quintuplet_menu = manage (new Menu);
MenuList& quintuplet_items (_quintuplet_menu->items());
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
quintuplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv5], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv5)));
quintuplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv10], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv10)));
quintuplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv20], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv20)));
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
grid_type_selector.AddMenuElem (Menu_Helpers::MenuElem (_("Quintuplets"), *_quintuplet_menu));
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* septuplet grid */
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
Gtk::Menu *_septuplet_menu = manage (new Menu);
MenuList& septuplet_items (_septuplet_menu->items());
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
septuplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv7], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv7)));
septuplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv14], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv14)));
septuplet_items.push_back (MenuElem (grid_type_strings[(int)GridTypeBeatDiv28], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeBeatDiv28)));
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
}
grid_type_selector.AddMenuElem (Menu_Helpers::MenuElem (_("Septuplets"), *_septuplet_menu));
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
grid_type_selector.AddMenuElem(SeparatorElem());
Rename SMPTE enum back to Timecode.
2018-02-26 19:38:18 -05:00
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeTimecode], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeTimecode)));
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeMinSec], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeMinSec)));
Fix a rather large naming thinko: GridTypeSamples should be CDFrames.
2018-02-26 18:02:24 -05:00
grid_type_selector.AddMenuElem (MenuElem (grid_type_strings[(int)GridTypeCDFrame], sigc::bind (sigc::mem_fun(*this, &Editor::grid_type_selection_done), (GridType) GridTypeCDFrame)));
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
}
Add keyboard shortcut to tooltip text where possible. git-svn-id: svn://localhost/ardour2/branches/3.0@6657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-08 19:50:24 -05:00
void
Editor::setup_tooltips ()
{
Make capitalization consistent and other minor spelling corrections.
2015-11-29 14:17:11 -05:00
set_tooltip (smart_mode_button, _("Smart Mode (add range functions to Grab Mode)"));
Use ARDOUR_UI_UTILS::set_tooltip rather than via ARDOUR_UI::set_tip This removes the direct dependence on ARDOUR_UI/Gtk_UI for setting tooltips. Removes inclusion of ardour_ui.h from 16 files.
2015-01-05 00:32:14 -05:00
set_tooltip (mouse_move_button, _("Grab Mode (select/move objects)"));
set_tooltip (mouse_cut_button, _("Cut Mode (split regions)"));
set_tooltip (mouse_select_button, _("Range Mode (select time ranges)"));
set_tooltip (mouse_draw_button, _("Draw Mode (draw and edit gain/notes/automation)"));
set_tooltip (mouse_timefx_button, _("Stretch Mode (time-stretch audio and midi regions, preserving pitch)"));
set_tooltip (mouse_audition_button, _("Audition Mode (listen to regions)"));
set_tooltip (mouse_content_button, _("Internal Edit Mode (edit notes and automation points)"));
set_tooltip (*_group_tabs, _("Groups: click to (de)activate\nContext-click for other operations"));
set_tooltip (nudge_forward_button, _("Nudge Region/Selection Later"));
set_tooltip (nudge_backward_button, _("Nudge Region/Selection Earlier"));
set_tooltip (zoom_in_button, _("Zoom In"));
set_tooltip (zoom_out_button, _("Zoom Out"));
set_tooltip (zoom_preset_selector, _("Zoom to Time Scale"));
set_tooltip (zoom_out_full_button, _("Zoom to Session"));
Make capitalization consistent and other minor spelling corrections.
2015-11-29 14:17:11 -05:00
set_tooltip (zoom_focus_selector, _("Zoom Focus"));
Use ARDOUR_UI_UTILS::set_tooltip rather than via ARDOUR_UI::set_tip This removes the direct dependence on ARDOUR_UI/Gtk_UI for setting tooltips. Removes inclusion of ardour_ui.h from 16 files.
2015-01-05 00:32:14 -05:00
set_tooltip (tav_expand_button, _("Expand Tracks"));
set_tooltip (tav_shrink_button, _("Shrink Tracks"));
set_tooltip (visible_tracks_selector, _("Number of visible tracks"));
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
set_tooltip (grid_type_selector, _("Grid Mode"));
set_tooltip (snap_mode_button, _("Snap Mode\n\nRight-click to visit Snap preferences."));
Make capitalization consistent and other minor spelling corrections.
2015-11-29 14:17:11 -05:00
set_tooltip (edit_point_selector, _("Edit Point"));
Use ARDOUR_UI_UTILS::set_tooltip rather than via ARDOUR_UI::set_tip This removes the direct dependence on ARDOUR_UI/Gtk_UI for setting tooltips. Removes inclusion of ardour_ui.h from 16 files.
2015-01-05 00:32:14 -05:00
set_tooltip (edit_mode_selector, _("Edit Mode"));
set_tooltip (nudge_clock, _("Nudge Clock\n(controls distance used to nudge regions and selections)"));
Add keyboard shortcut to tooltip text where possible. git-svn-id: svn://localhost/ardour2/branches/3.0@6657 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-08 19:50:24 -05:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
int
Fix indentation. git-svn-id: svn://localhost/ardour2/branches/3.0@5050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 21:24:44 -04:00
Editor::convert_drop_to_paths (
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 11:45:21 -04:00
vector<string>& paths,
Fix some unused parameter warnings. git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 11:55:17 -04:00
const RefPtr<Gdk::DragContext>& /*context*/,
gint /*x*/,
gint /*y*/,
Fix indentation. git-svn-id: svn://localhost/ardour2/branches/3.0@5050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 21:24:44 -04:00
const SelectionData& data,
Fix some unused parameter warnings. git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 11:55:17 -04:00
guint /*info*/,
guint /*time*/)
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session == 0) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
return -1;
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
remove Glib::ustring from gtk2_ardour git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 12:51:02 -04:00
vector<string> uris = data.get_uris();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
if (uris.empty()) {
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
/* This is seriously fucked up. Nautilus doesn't say that its URI lists
are actually URI lists. So do it by hand.
*/
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
if (data.get_target() != "text/plain") {
return -1;
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
/* Parse the "uri-list" format that Nautilus provides,
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
where each pathname is delimited by \r\n.
THERE MAY BE NO NULL TERMINATING CHAR!!!
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
*/
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
remove Glib::ustring from gtk2_ardour git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 12:51:02 -04:00
string txt = data.get_text();
remove compilation warning
2013-06-23 07:37:50 -04:00
char* p;
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
const char* q;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
remove compilation warning
2013-06-23 07:37:50 -04:00
p = (char *) malloc (txt.length() + 1);
txt.copy (p, txt.length(), 0);
p[txt.length()] = '\0';
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
while (p)
{
if (*p != '#')
{
while (g_ascii_isspace (*p))
p++;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
q = p;
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
while (*q && (*q != '\n') && (*q != '\r')) {
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
q++;
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
if (q > p)
{
q--;
while (q > p && g_ascii_isspace (*q))
q--;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
if (q > p)
{
remove Glib::ustring from gtk2_ardour git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 12:51:02 -04:00
uris.push_back (string (p, q - p + 1));
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
}
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
p = strchr (p, '\n');
if (p)
p++;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
free ((void*)p);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
if (uris.empty()) {
return -1;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
remove Glib::ustring from gtk2_ardour git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 12:51:02 -04:00
for (vector<string>::iterator i = uris.begin(); i != uris.end(); ++i) {
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
if ((*i).substr (0,7) == "file://") {
use Glib URI utility function to generate a local filename from a URI, rather than hand-crafted code
2014-01-17 09:24:18 -05:00
paths.push_back (Glib::filename_from_uri (*i));
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
many changes, read the diffs git-svn-id: svn://localhost/trunk/ardour2@214 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-29 19:34:21 -05:00
return 0;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
Editor::new_tempo_section ()
{
}
void
Editor::map_transport_state ()
{
break out of step editing if a session goes away; do nothing in Editor::located() if the session has gone away git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 11:19:58 -04:00
ENSURE_GUI_THREAD (*this, &Editor::map_transport_state);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
functioning invert (polarity) button; menu item removed and track name button no longer relablled when inverted git-svn-id: svn://localhost/ardour2/branches/3.0@6813 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 20:59:09 -04:00
if (_session && _session->transport_stopped()) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
have_pending_keyboard_selection = false;
}
Merged with trunk R1622. git-svn-id: svn://localhost/ardour2/branches/midi@1623 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-03-19 03:07:38 -04:00
various work to make loop/punch display work better (including fixes for bugs present in master also)
2014-01-27 21:27:13 -05:00
update_loop_range_view ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Reset Playhead interpolation when looping and locating
2017-03-31 08:11:49 -04:00
void
Editor::transport_looped ()
{
/* reset Playhead position interpolation.
* see Editor::super_rapid_screen_update
*/
_last_update_time = 0;
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
/* UNDO/REDO */
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
void
Editor::begin_selection_op_history ()
{
selection_op_cmd_depth = 0;
selection_op_history_it = 0;
Properly deallocate memory when clearing selection_op_history and before XMLNode*s. Improve some comments.
2015-02-07 07:33:09 -05:00
while(!selection_op_history.empty()) {
delete selection_op_history.front();
selection_op_history.pop_front();
}
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
selection_undo_action->set_sensitive (false);
selection_redo_action->set_sensitive (false);
selection_op_history.push_front (&_selection_memento->get_state ());
}
void
Editor::begin_reversible_selection_op (string name)
{
if (_session) {
clean up whitespace & debug output in 44203ce
2015-01-10 20:55:48 -05:00
//cerr << name << endl;
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
/* begin/commit pairs can be nested */
selection_op_cmd_depth++;
}
}
void
Editor::commit_reversible_selection_op ()
{
if (_session) {
if (selection_op_cmd_depth == 1) {
if (selection_op_history_it > 0 && selection_op_history_it < selection_op_history.size()) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* The user has undone some selection ops and then made a new one,
* making anything earlier in the list invalid.
*/
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
list<XMLNode *>::iterator it = selection_op_history.begin();
Properly deallocate memory when clearing selection_op_history and before XMLNode*s. Improve some comments.
2015-02-07 07:33:09 -05:00
list<XMLNode *>::iterator e_it = it;
advance (e_it, selection_op_history_it);
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
for (; it != e_it; ++it) {
Properly deallocate memory when clearing selection_op_history and before XMLNode*s. Improve some comments.
2015-02-07 07:33:09 -05:00
delete *it;
}
selection_op_history.erase (selection_op_history.begin(), e_it);
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
}
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
selection_op_history.push_front (&_selection_memento->get_state ());
selection_op_history_it = 0;
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
selection_undo_action->set_sensitive (true);
selection_redo_action->set_sensitive (false);
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
}
if (selection_op_cmd_depth > 0) {
selection_op_cmd_depth--;
}
}
}
void
Add automation track control points to undo history (and selection_op history).
2014-12-23 12:29:43 -05:00
Editor::undo_selection_op ()
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
{
if (_session) {
selection_op_history_it++;
uint32_t n = 0;
for (std::list<XMLNode *>::iterator i = selection_op_history.begin(); i != selection_op_history.end(); ++i) {
if (n == selection_op_history_it) {
_selection_memento->set_state (*(*i), Stateful::current_state_version);
selection_redo_action->set_sensitive (true);
}
++n;
}
/* is there an earlier entry? */
if ((selection_op_history_it + 1) >= selection_op_history.size()) {
selection_undo_action->set_sensitive (false);
}
}
}
void
Add automation track control points to undo history (and selection_op history).
2014-12-23 12:29:43 -05:00
Editor::redo_selection_op ()
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
{
if (_session) {
if (selection_op_history_it > 0) {
selection_op_history_it--;
}
uint32_t n = 0;
for (std::list<XMLNode *>::iterator i = selection_op_history.begin(); i != selection_op_history.end(); ++i) {
if (n == selection_op_history_it) {
_selection_memento->set_state (*(*i), Stateful::current_state_version);
selection_undo_action->set_sensitive (true);
}
++n;
}
if (selection_op_history_it == 0) {
selection_redo_action->set_sensitive (false);
}
}
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Editor::begin_reversible_command (string name)
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session) {
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
before.push_back (&_selection_memento->get_state ());
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_session->begin_reversible_command (name);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
Fix session range location by hooking into the undo system. Fixes #3654. git-svn-id: svn://localhost/ardour2/branches/3.0@8539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 12:38:56 -05:00
void
Editor::begin_reversible_command (GQuark q)
{
if (_session) {
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
before.push_back (&_selection_memento->get_state ());
Fix session range location by hooking into the undo system. Fixes #3654. git-svn-id: svn://localhost/ardour2/branches/3.0@8539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 12:38:56 -05:00
_session->begin_reversible_command (q);
}
}
Clean up Session's _current_trans when aborting a drag.
2015-02-05 07:32:57 -05:00
void
Editor::abort_reversible_command ()
{
if (_session) {
Properly deallocate memory when clearing selection_op_history and before XMLNode*s. Improve some comments.
2015-02-07 07:33:09 -05:00
while(!before.empty()) {
delete before.front();
before.pop_front();
}
Clean up Session's _current_trans when aborting a drag.
2015-02-05 07:32:57 -05:00
_session->abort_reversible_command ();
}
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Editor::commit_reversible_command ()
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session) {
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
if (before.size() == 1) {
_session->add_command (new MementoCommand<SelectionMemento>(*(_selection_memento), before.front(), &_selection_memento->get_state ()));
Make redo action insensitive after new command. Don't erroneously send first_move more than once after autoscroll drag.
2015-02-05 03:57:56 -05:00
redo_action->set_sensitive(false);
Fix previous commit.
2014-12-22 13:09:21 -05:00
undo_action->set_sensitive(true);
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
begin_selection_op_history ();
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
}
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
if (before.empty()) {
cerr << "Please call begin_reversible_command() before commit_reversible_command()." << endl;
} else {
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
before.pop_back();
}
do not save editor state in every reversible commands git-svn-id: svn://localhost/ardour2/branches/3.0@6698 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-18 09:44:08 -05:00
_session->commit_reversible_command ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
void
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
Editor::history_changed ()
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
string label;
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (undo_action && _session) {
if (_session->undo_depth() == 0) {
Hopefully fix some i18n bugs (#3565). git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 14:46:30 -05:00
label = S_("Command|Undo");
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
} else {
Hopefully fix some i18n bugs (#3565). git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 14:46:30 -05:00
label = string_compose(S_("Command|Undo (%1)"), _session->next_undo());
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
undo_action->property_label() = label;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (redo_action && _session) {
if (_session->redo_depth() == 0) {
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
label = _("Redo");
Fix redo action sensitivity for non-editor undo stack changes.
2015-09-26 10:59:44 -04:00
redo_action->set_sensitive (false);
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
} else {
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
label = string_compose(_("Redo (%1)"), _session->next_redo());
Fix redo action sensitivity for non-editor undo stack changes.
2015-09-26 10:59:44 -04:00
redo_action->set_sensitive (true);
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
}
redo_action->property_label() = label;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
void
Rename Editor::duplicate_dialog to Editor::duplicate_range git-svn-id: svn://localhost/ardour2/branches/3.0@12988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-07-04 17:31:06 -04:00
Editor::duplicate_range (bool with_dialog)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
float times = 1.0f;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
RegionSelection rs = get_regions_from_selection_and_entered ();
Merged with trunk R1705. Synced .po files with trunk. Fixed more editor operations to be type agnostic (ie not audio only). git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-12 19:20:37 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (selection->time.length() == 0 && rs.empty()) {
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
return;
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
if (with_dialog) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Fix some i18n bugs; hopefully most if not all of #2999. git-svn-id: svn://localhost/ardour2/branches/3.0@6927 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-17 20:25:03 -04:00
ArdourDialog win (_("Duplicate"));
Some more copy-editing. Make 'make mono regions' option sensitive to the region it is dealing with. git-svn-id: svn://localhost/ardour2/branches/3.0@7025 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-29 21:21:43 -04:00
Label label (_("Number of duplications:"));
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
SpinButton spinner (adjustment, 0.0, 1);
HBox hbox;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
win.get_vbox()->set_spacing (12);
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
win.get_vbox()->pack_start (hbox);
hbox.set_border_width (6);
hbox.pack_start (label, PACK_EXPAND_PADDING, 12);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
/* dialogs have ::add_action_widget() but that puts the spinner in the wrong
place, visually. so do this by hand.
*/
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
hbox.pack_start (spinner, PACK_EXPAND_PADDING, 12);
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
spinner.signal_activate().connect (sigc::bind (sigc::mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT));
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
spinner.grab_focus();
hbox.show ();
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
label.show ();
spinner.show ();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
win.add_button (_("Duplicate"), RESPONSE_ACCEPT);
win.set_default_response (RESPONSE_ACCEPT);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
spinner.grab_focus ();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
switch (win.run ()) {
case RESPONSE_ACCEPT:
break;
default:
return;
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
times = adjustment.get_value();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
if ((current_mouse_mode() == MouseRange)) {
fix duplicate, and clarify its behaviour in smart mode; includes a fix for TimeSelection::length() which didn't account for "no selection" in its return value git-svn-id: svn://localhost/ardour2/branches/3.0@13607 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 10:59:01 -05:00
if (selection->time.length()) {
duplicate_selection (times);
}
} else if (get_smart_mode()) {
if (selection->time.length()) {
duplicate_selection (times);
globally remove all trailing whitespace from ardour code base. Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
} else
fix duplicate, and clarify its behaviour in smart mode; includes a fix for TimeSelection::length() which didn't account for "no selection" in its return value git-svn-id: svn://localhost/ardour2/branches/3.0@13607 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 10:59:01 -05:00
duplicate_some_regions (rs, times);
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
} else {
Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 17:43:18 -05:00
duplicate_some_regions (rs, times);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
void
Editor::set_edit_mode (EditMode m)
{
Config->set_edit_mode (m);
}
void
Editor::cycle_edit_mode ()
{
switch (Config->get_edit_mode()) {
case Slide:
remove all trace of SAE from source code. This had become incoherent over time, and posed a development hazard and burden going forward
2015-10-26 15:17:42 -04:00
Config->set_edit_mode (Ripple);
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
break;
simplify zooming, remove Editor::clamp_samples_per_pixel(), fix getting "stuck" at max and min zoom levels
2014-07-02 15:53:24 -04:00
case Splice:
Ripple mode: basic implementation Add a value for Ripple to EditMode enum. Add Ripple edit mode to edit mode dropdown, by adding it to the Editor::build_edit_mode_menu() helper function, and remove the old code that added items to the (now unused) Editor::edit_mode_strings. Add the regions that should be affected by the drag to RegionDrag::_views so that the drag carries them along automatically. Use a copy of the RegionList in Playlist::core_ripple(), since bad things happen when iterating over regions and they get moved around in the list. Handle rippling in removal of regions from playlist. When dragging in ripple mode, exclude all regions that lie before the original start position of the selected regions being dragged from rippling: this is what Mixbus does. Make editor dragging respect snap-to settings, by using the existing compute_x_delta() function, which did almost the right thing. Move setting of _last_frame_position out of that function so all ripple-dragged regions can move. Ripple when dragging from region list: even though Mixbus doesn't do this, it seems like a good idea. Prevent multi-track selection being dragged across tracks, by making RegionMotionDrag::y_movement_allowed() virtual, and overriding it in RegionRippleDrag to forbid dragging of selections containing regions on more than one track to dofferent tracks in ripple mode. Remember which TimeAxisView a ripple-mode drag that's allowed cross-track drags started from, so that the effect of rippling regions after any region that's dragged off that track can be undone.
2013-10-23 16:50:01 -04:00
case Ripple:
Revert to old Lock mode (still called Lock). Also make midi notes obey the snap delta modifire
2015-05-18 13:27:50 -04:00
Config->set_edit_mode (Lock);
Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 17:43:18 -05:00
break;
Revert to old Lock mode (still called Lock). Also make midi notes obey the snap delta modifire
2015-05-18 13:27:50 -04:00
case Lock:
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
Config->set_edit_mode (Slide);
break;
}
}
get editor.cc to compile git-svn-id: svn://localhost/trunk/ardour2@99 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-15 21:57:22 -05:00
void
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
Editor::edit_mode_selection_done (EditMode m)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
Config->set_edit_mode (m);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
get editor.cc to compile git-svn-id: svn://localhost/trunk/ardour2@99 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-15 21:57:22 -05:00
void
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
Editor::grid_type_selection_done (GridType gridtype)
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
{
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
RefPtr<RadioAction> ract = grid_type_action (gridtype);
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
if (ract) {
ract->set_active ();
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
get editor.cc to compile git-svn-id: svn://localhost/trunk/ardour2@99 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-15 21:57:22 -05:00
void
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
Editor::snap_mode_selection_done (SnapMode mode)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
RefPtr<RadioAction> ract = snap_mode_action (mode);
if (ract) {
ract->set_active (true);
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
void
Editor::cycle_edit_point (bool with_marker)
{
remove EditAtSelectedMarker for Mixbus, to match mb2. (also fix an existing thinko in the edit point selection actions) (oops: also fix previous track selection fix so that it pays attention to the selection property of the group)
2014-07-09 17:33:48 -04:00
if(Profile->get_mixbus())
with_marker = false;
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
switch (_edit_point) {
case EditAtMouse:
set_edit_point_preference (EditAtPlayhead);
break;
case EditAtPlayhead:
if (with_marker) {
set_edit_point_preference (EditAtSelectedMarker);
} else {
set_edit_point_preference (EditAtMouse);
}
break;
case EditAtSelectedMarker:
set_edit_point_preference (EditAtMouse);
break;
}
}
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
void
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
Editor::edit_point_selection_done (EditPoint ep)
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
set_edit_point_preference (ep);
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
}
get editor.cc to compile git-svn-id: svn://localhost/trunk/ardour2@99 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-15 21:57:22 -05:00
void
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
Editor::build_zoom_focus_menu ()
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
using namespace Menu_Helpers;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
zoom_focus_selector.AddMenuElem (MenuElem (zoom_focus_strings[(int)ZoomFocusLeft], sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done), (ZoomFocus) ZoomFocusLeft)));
zoom_focus_selector.AddMenuElem (MenuElem (zoom_focus_strings[(int)ZoomFocusRight], sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done), (ZoomFocus) ZoomFocusRight)));
zoom_focus_selector.AddMenuElem (MenuElem (zoom_focus_strings[(int)ZoomFocusCenter], sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done), (ZoomFocus) ZoomFocusCenter)));
zoom_focus_selector.AddMenuElem (MenuElem (zoom_focus_strings[(int)ZoomFocusPlayhead], sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done), (ZoomFocus) ZoomFocusPlayhead)));
zoom_focus_selector.AddMenuElem (MenuElem (zoom_focus_strings[(int)ZoomFocusMouse], sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done), (ZoomFocus) ZoomFocusMouse)));
zoom_focus_selector.AddMenuElem (MenuElem (zoom_focus_strings[(int)ZoomFocusEdit], sigc::bind (sigc::mem_fun(*this, &Editor::zoom_focus_selection_done), (ZoomFocus) ZoomFocusEdit)));
add Editor::edit_mode_strings to allow for i18n; correctly size ArdourDropdowns using longest, translated strings
2014-07-09 16:48:19 -04:00
update dropdown triangle
2014-08-30 12:26:03 -04:00
set_size_request_to_display_given_text (zoom_focus_selector, zoom_focus_strings, COMBO_TRIANGLE_WIDTH, 2);
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
void
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
Editor::zoom_focus_selection_done (ZoomFocus f)
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
{
RefPtr<RadioAction> ract = zoom_focus_action (f);
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
if (ract) {
ract->set_active ();
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
void
Editor::build_track_count_menu ()
{
using namespace Menu_Helpers;
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
if (!Profile->get_mixbus()) {
visible_tracks_selector.AddMenuElem (MenuElem (X_("1"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 1)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("2"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 2)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("3"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 3)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("4"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 4)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("8"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 8)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("12"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 12)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("16"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 16)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("20"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 20)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("24"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 24)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("32"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32)));
visible_tracks_selector.AddMenuElem (MenuElem (X_("64"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 64)));
remove track-selection requirement so fit_selected_tracks works as coded. change name to fit-selection. remove action to zoom (both axes) because this can trivially be accomplished by clicking (f)it and (z)oom sequentially, and it frees a keybinding. remaining bug: Fitting a selection of MIDI regions doesnt work right
2015-01-11 12:46:36 -05:00
visible_tracks_selector.AddMenuElem (MenuElem (_("Selection"), sigc::mem_fun(*this, &Editor::fit_selection)));
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
visible_tracks_selector.AddMenuElem (MenuElem (_("All"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0)));
} else {
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 1 track"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 1)));
Add some new zoom-to-selection actions, so zoom tool is less needed. Reverse order of items in the zoom menus to match Ardour. Consolidate the extra zoom math into a function; this fixes a problem in zoom-to-session.
2014-07-23 12:28:45 -04:00
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 2 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 2)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 4 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 4)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 8 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 8)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 16 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 16)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 24 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 24)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 32 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 32)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit 48 tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 48)));
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit All tracks"), sigc::bind (sigc::mem_fun(*this, &Editor::set_visible_track_count), 0)));
remove track-selection requirement so fit_selected_tracks works as coded. change name to fit-selection. remove action to zoom (both axes) because this can trivially be accomplished by clicking (f)it and (z)oom sequentially, and it frees a keybinding. remaining bug: Fitting a selection of MIDI regions doesnt work right
2015-01-11 12:46:36 -05:00
visible_tracks_selector.AddMenuElem (MenuElem (_("Fit Selection"), sigc::mem_fun(*this, &Editor::fit_selection)));
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 10 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10)));
Add some new zoom-to-selection actions, so zoom tool is less needed. Reverse order of items in the zoom menus to match Ardour. Consolidate the extra zoom math into a function; this fixes a problem in zoom-to-session.
2014-07-23 12:28:45 -04:00
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 100 ms"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 100)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 1 sec"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 1 * 1000)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 10 sec"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10 * 1000)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 1 min"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 60 * 1000)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 10 min"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 10 * 60 * 1000)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 1 hour"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 60 * 60 * 1000)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 8 hours"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 8 * 60 * 60 * 1000)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to 24 hours"), sigc::bind (sigc::mem_fun(*this, &Editor::set_zoom_preset), 24 * 60 * 60 * 1000)));
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Session"), sigc::mem_fun(*this, &Editor::temporal_zoom_session)));
Editor zoom: add zoom_to_extents()
2017-08-27 00:06:29 -04:00
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Extents"), sigc::mem_fun(*this, &Editor::temporal_zoom_extents)));
Further fixes to non-cxx11 enabled builds Hopefully all that is necessary this time
2016-12-13 02:10:30 -05:00
zoom_preset_selector.AddMenuElem (MenuElem (_("Zoom to Range/Region Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::temporal_zoom_selection), Horizontal)));
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
}
}
void
Editor::set_zoom_preset (int64_t ms)
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (ms <= 0) {
fix the visible_tracks_selector to show * when user tweaks a track height. various experimental tweaks to visible_tracks_selector and a new zoom_preset_selector for Mixbus.
2014-07-11 15:50:51 -04:00
temporal_zoom_session();
return;
}
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
ARDOUR::samplecnt_t const sample_rate = ARDOUR::AudioEngine::instance()->sample_rate();
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
temporal_zoom ((sample_rate * ms / 1000) / _visible_canvas_width);
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
}
void
Editor::set_visible_track_count (int32_t n)
{
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
_visible_track_count = n;
/* if the canvas hasn't really been allocated any size yet, just
record the desired number of visible tracks and return. when canvas
allocation happens, we will get called again and then we can do the
real work.
*/
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
if (_visible_canvas_height <= 1) {
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
return;
}
actually resize track heights to follow visible-tracks choice
2014-03-25 09:01:26 -04:00
int h;
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
string str;
fix slow behaviour when changing visible track height in Editor::set_visible_track_count()
2014-12-23 12:41:32 -05:00
DisplaySuspender ds;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
if (_visible_track_count > 0) {
add Editor::trackviews_height() convenience function to determine height of trackview area of canvas; use to help fix set_visible_track_count(); don't consider hidden tracks in that function; add "Selected" to that selector menu
2014-07-15 18:09:04 -04:00
h = trackviews_height() / _visible_track_count;
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
std::ostringstream s;
s << _visible_track_count;
str = s.str();
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
} else if (_visible_track_count == 0) {
add Editor::trackviews_height() convenience function to determine height of trackview area of canvas; use to help fix set_visible_track_count(); don't consider hidden tracks in that function; add "Selected" to that selector menu
2014-07-15 18:09:04 -04:00
uint32_t n = 0;
tweak "visible track count", take automation lanes into account.
2017-07-19 14:37:57 -04:00
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
add Editor::trackviews_height() convenience function to determine height of trackview area of canvas; use to help fix set_visible_track_count(); don't consider hidden tracks in that function; add "Selected" to that selector menu
2014-07-15 18:09:04 -04:00
if ((*i)->marked_for_display()) {
++n;
tweak "visible track count", take automation lanes into account.
2017-07-19 14:37:57 -04:00
TimeAxisView::Children cl ((*i)->get_child_list ());
for (TimeAxisView::Children::const_iterator j = cl.begin(); j != cl.end(); ++j) {
if ((*j)->marked_for_display()) {
++n;
}
}
add Editor::trackviews_height() convenience function to determine height of trackview area of canvas; use to help fix set_visible_track_count(); don't consider hidden tracks in that function; add "Selected" to that selector menu
2014-07-15 18:09:04 -04:00
}
}
tweak "visible track count", take automation lanes into account.
2017-07-19 14:37:57 -04:00
if (n == 0) {
visible_tracks_selector.set_text (X_("*"));
return;
}
add Editor::trackviews_height() convenience function to determine height of trackview area of canvas; use to help fix set_visible_track_count(); don't consider hidden tracks in that function; add "Selected" to that selector menu
2014-07-15 18:09:04 -04:00
h = trackviews_height() / n;
str = _("All");
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
} else {
globally remove all trailing whitespace from ardour code base. Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
/* negative value means that the visible track count has
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
been overridden by explicit track height changes.
*/
visible_tracks_selector.set_text (X_("*"));
return;
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
}
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
actually resize track heights to follow visible-tracks choice
2014-03-25 09:01:26 -04:00
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
update track-height scaling: “number of visible tracks”: count automation lanes as tracks. Distribute equally. “Summary View”: the visual lane represents both track + automation. Set the total height. Left to do: recursive “Shrink” and “Expand” tools if there is no explicit selection.
2015-03-19 16:55:28 -04:00
(*i)->set_height (h, TimeAxisView::HeightPerLane);
actually resize track heights to follow visible-tracks choice
2014-03-25 09:01:26 -04:00
}
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
first part of switch from shrink/expand tracks to pyramix-style "pick number of visible tracks". function to follow shortly, this is the control widget part
2014-03-25 08:21:08 -04:00
if (str != visible_tracks_selector.get_text()) {
visible_tracks_selector.set_text (str);
}
}
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
void
Editor::override_visible_track_count ()
{
track height fixes: * retain [custom] track-height Editor::override_visible_track_count() is called repeatedly (for every change), there was a 50/50 chance of it saving the right value. * adjust default for new sessions: use “Normal” track height until told otherwise.
2014-10-20 14:33:28 -04:00
_visible_track_count = -1;
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
visible_tracks_selector.set_text (_("*"));
most of the support for save/restore of visible track count
2014-03-25 10:33:18 -04:00
}
Fix the return type for the edit_controls_button_release signal handler. Make a click in the empty space below track controls clear the track selection (#3993). git-svn-id: svn://localhost/ardour2/branches/3.0@9371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19 06:18:21 -04:00
bool
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Editor::edit_controls_button_release (GdkEventButton* ev)
{
if (Keyboard::is_context_menu_event (ev)) {
re-introduce "add track/bus" from mixer window
2016-05-05 21:08:46 -04:00
ARDOUR_UI::instance()->add_route ();
Fix the return type for the edit_controls_button_release signal handler. Make a click in the empty space below track controls clear the track selection (#3993). git-svn-id: svn://localhost/ardour2/branches/3.0@9371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19 06:18:21 -04:00
} else if (ev->button == 1) {
selection->clear_tracks ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Fix the return type for the edit_controls_button_release signal handler. Make a click in the empty space below track controls clear the track selection (#3993). git-svn-id: svn://localhost/ardour2/branches/3.0@9371 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19 06:18:21 -04:00
return true;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Cleanup some more gint -> bools. git-svn-id: svn://localhost/ardour2/branches/3.0@9374 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19 06:43:43 -04:00
bool
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Editor::mouse_select_button_release (GdkEventButton* ev)
{
/* this handles just right-clicks */
if (ev->button != 3) {
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
return false;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
return true;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
void
Editor::set_zoom_focus (ZoomFocus f)
{
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
string str = zoom_focus_strings[(int)f];
New theme for editor window using ArdourMenu
2014-03-23 19:11:42 -04:00
if (str != zoom_focus_selector.get_text()) {
zoom_focus_selector.set_text (str);
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
if (zoom_focus != f) {
zoom_focus = f;
instant_save ();
}
}
add cycle-zoom-focus and bind to "1" by default git-svn-id: svn://localhost/ardour2/branches/3.0@13658 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-13 11:20:37 -05:00
void
Editor::cycle_zoom_focus ()
{
switch (zoom_focus) {
case ZoomFocusLeft:
set_zoom_focus (ZoomFocusRight);
break;
case ZoomFocusRight:
set_zoom_focus (ZoomFocusCenter);
break;
case ZoomFocusCenter:
set_zoom_focus (ZoomFocusPlayhead);
break;
case ZoomFocusPlayhead:
set_zoom_focus (ZoomFocusMouse);
break;
case ZoomFocusMouse:
set_zoom_focus (ZoomFocusEdit);
break;
case ZoomFocusEdit:
set_zoom_focus (ZoomFocusLeft);
break;
}
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
Editor::update_grid ()
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (grid_musical()) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
std::vector<TempoMap::BBTPoint> grid;
if (bbt_ruler_scale != bbt_show_many) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
compute_current_bbt_points (grid, _leftmost_sample, _leftmost_sample + current_page_samples());
globally remove all trailing whitespace from ardour code base. Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
maybe_draw_grid_lines ();
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
} else if (grid_nonmusical()) {
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
maybe_draw_grid_lines ();
} else {
hide_grid_lines ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
}
many options moved to menus, region list context menu sort of operational git-svn-id: svn://localhost/trunk/ardour2@219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-31 13:20:42 -05:00
void
Editor::toggle_follow_playhead ()
{
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("toggle-follow-playhead"));
set_follow_playhead (tact->get_active());
many options moved to menus, region list context menu sort of operational git-svn-id: svn://localhost/trunk/ardour2@219 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-31 13:20:42 -05:00
}
Disable follow-playhead during drags. Fixes #3647. git-svn-id: svn://localhost/ardour2/branches/3.0@8444 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:28:28 -05:00
/** @param yn true to follow playhead, otherwise false.
* @param catch_up true to reset the editor view to show the playhead (if yn == true), otherwise false.
*/
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Disable follow-playhead during drags. Fixes #3647. git-svn-id: svn://localhost/ardour2/branches/3.0@8444 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:28:28 -05:00
Editor::set_follow_playhead (bool yn, bool catch_up)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
if (_follow_playhead != yn) {
Disable follow-playhead during drags. Fixes #3647. git-svn-id: svn://localhost/ardour2/branches/3.0@8444 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:28:28 -05:00
if ((_follow_playhead = yn) == true && catch_up) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
/* catch up */
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
reset_x_origin_to_follow_playhead ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
instant_save ();
}
}
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive) git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 11:33:04 -04:00
void
Editor::toggle_stationary_playhead ()
{
replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
2018-12-12 11:22:38 -05:00
RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editor"), X_("toggle-stationary-playhead"));
set_stationary_playhead (tact->get_active());
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive) git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 11:33:04 -04:00
}
void
Editor::set_stationary_playhead (bool yn)
{
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
if (_stationary_playhead != yn) {
if ((_stationary_playhead = yn) == true) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* catch up -- FIXME need a 3.0 equivalent of this 2.X call */
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
// update_current_screen ();
}
instant_save ();
}
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive) git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-16 11:33:04 -04:00
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
PlaylistSelector&
Editor::playlist_selector () const
{
return *_playlist_selector;
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplecnt_t
Editor::get_paste_offset (samplepos_t pos, unsigned paste_count, samplecnt_t duration)
Implement "multi-paste" for notes, regions, and automation. The idea here is that pasting several times to the same location doesn't make sense. Instead, the paste is appended past the last paste, snapped to the grid. This make it simple to replicate a given section a number of times, simply by copying once and pasting several times. This behaviour only appears when successive pastes are done to the same location (whatever the edit point is). When the paste point changes, the "multi-paste" state is reset. Boots 'n cats 'n boots 'n cats.
2014-11-14 20:04:09 -05:00
{
if (paste_count == 0) {
/* don't bother calculating an offset that will be zero anyway */
return 0;
}
/* calculate basic unsnapped multi-paste offset */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplecnt_t offset = paste_count * duration;
Implement "multi-paste" for notes, regions, and automation. The idea here is that pasting several times to the same location doesn't make sense. Instead, the paste is appended past the last paste, snapped to the grid. This make it simple to replicate a given section a number of times, simply by copying once and pasting several times. This behaviour only appears when successive pastes are done to the same location (whatever the edit point is). When the paste point changes, the "multi-paste" state is reset. Boots 'n cats 'n boots 'n cats.
2014-11-14 20:04:09 -05:00
Support cut/copy/paste of several regions and lines at once. The idea here is to do the reasonable thing, and copy objects of some type (e.g. MIDI region, gain line) to tracks with a matching type. The user can override this with a track selection, which will be used straight-up. Lost: ability to copy/paste lines across types, e.g. gain to pan. This is often questionable, but sometimes useful, so we will need to implement some sort of "greedy mode" to make it possible. Implementation simple, but not sure what to do. Perhaps this should only be possible if one automation track is explicitly (i.e. via track selection) involved, and the types are at least compatible-ish?
2014-11-16 17:04:27 -05:00
/* snap offset so pos + offset is aligned to the grid */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
MusicSample offset_pos (pos + offset, 0);
Support cut/copy/paste of several regions and lines at once. The idea here is to do the reasonable thing, and copy objects of some type (e.g. MIDI region, gain line) to tracks with a matching type. The user can override this with a track selection, which will be used straight-up. Lost: ability to copy/paste lines across types, e.g. gain to pan. This is often questionable, but sometimes useful, so we will need to implement some sort of "greedy mode" to make it possible. Implementation simple, but not sure what to do. Perhaps this should only be possible if one automation track is explicitly (i.e. via track selection) involved, and the types are at least compatible-ish?
2014-11-16 17:04:27 -05:00
snap_to(offset_pos, RoundUpMaybe);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
offset = offset_pos.sample - pos;
Implement "multi-paste" for notes, regions, and automation. The idea here is that pasting several times to the same location doesn't make sense. Instead, the paste is appended past the last paste, snapped to the grid. This make it simple to replicate a given section a number of times, simply by copying once and pasting several times. This behaviour only appears when successive pastes are done to the same location (whatever the edit point is). When the paste point changes, the "multi-paste" state is reset. Boots 'n cats 'n boots 'n cats.
2014-11-14 20:04:09 -05:00
return offset;
}
Factor out grid beat divisions.
2015-01-07 18:30:25 -05:00
unsigned
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::get_grid_beat_divisions(samplepos_t position)
Factor out grid beat divisions.
2015-01-07 18:30:25 -05:00
{
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
switch (_grid_type) {
case GridTypeBeatDiv32: return 32;
case GridTypeBeatDiv28: return 28;
case GridTypeBeatDiv24: return 24;
case GridTypeBeatDiv20: return 20;
case GridTypeBeatDiv16: return 16;
case GridTypeBeatDiv14: return 14;
case GridTypeBeatDiv12: return 12;
case GridTypeBeatDiv10: return 10;
case GridTypeBeatDiv8: return 8;
case GridTypeBeatDiv7: return 7;
case GridTypeBeatDiv6: return 6;
case GridTypeBeatDiv5: return 5;
case GridTypeBeatDiv4: return 4;
case GridTypeBeatDiv3: return 3;
case GridTypeBeatDiv2: return 2;
Fix missing enum case: Avoid a divide-by-0 crash.
2018-08-13 13:55:19 -04:00
case GridTypeBeat: return 1;
case GridTypeBar: return 1;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
case GridTypeNone: return 0;
Rename SMPTE enum back to Timecode.
2018-02-26 19:38:18 -05:00
case GridTypeTimecode: return 0;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
case GridTypeMinSec: return 0;
Fix a rather large naming thinko: GridTypeSamples should be CDFrames.
2018-02-26 18:02:24 -05:00
case GridTypeCDFrame: return 0;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
default: return 0;
Factor out grid beat divisions.
2015-01-07 18:30:25 -05:00
}
return 0;
}
Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio basis for non-musical snap.
2016-06-11 12:46:13 -04:00
/** returns the current musical grid divisiions using the supplied modifier mask from a GtkEvent.
if the grid is non-musical, returns 0.
if the grid is snapped to bars, returns -1.
@param event_state the current keyboard modifier mask.
*/
fix incorrect return type for Editor::get_grid_music_divisions().
2016-11-16 11:13:16 -05:00
int32_t
Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio basis for non-musical snap.
2016-06-11 12:46:13 -04:00
Editor::get_grid_music_divisions (uint32_t event_state)
{
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
if (snap_mode() == SnapOff && !ArdourKeyboard::indicates_snap (event_state)) {
Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio basis for non-musical snap.
2016-06-11 12:46:13 -04:00
return 0;
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
if (snap_mode() != SnapOff && ArdourKeyboard::indicates_snap (event_state)) {
Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio basis for non-musical snap.
2016-06-11 12:46:13 -04:00
return 0;
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
switch (_grid_type) {
case GridTypeBeatDiv32: return 32;
case GridTypeBeatDiv28: return 28;
case GridTypeBeatDiv24: return 24;
case GridTypeBeatDiv20: return 20;
case GridTypeBeatDiv16: return 16;
case GridTypeBeatDiv14: return 14;
case GridTypeBeatDiv12: return 12;
case GridTypeBeatDiv10: return 10;
case GridTypeBeatDiv8: return 8;
case GridTypeBeatDiv7: return 7;
case GridTypeBeatDiv6: return 6;
case GridTypeBeatDiv5: return 5;
case GridTypeBeatDiv4: return 4;
case GridTypeBeatDiv3: return 3;
case GridTypeBeatDiv2: return 2;
case GridTypeBeat: return 1;
case GridTypeBar : return -1;
case GridTypeNone: return 0;
Rename SMPTE enum back to Timecode.
2018-02-26 19:38:18 -05:00
case GridTypeTimecode: return 0;
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
case GridTypeMinSec: return 0;
Fix a rather large naming thinko: GridTypeSamples should be CDFrames.
2018-02-26 18:02:24 -05:00
case GridTypeCDFrame: return 0;
Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio basis for non-musical snap.
2016-06-11 12:46:13 -04:00
}
return 0;
}
convert codebase to use Temporal for various time types
2017-09-24 12:03:54 -04:00
Temporal::Beats
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::get_grid_type_as_beats (bool& success, samplepos_t position)
lots of MIDI editing stuff. to be explained on the website when its done git-svn-id: svn://localhost/ardour2/branches/3.0@5596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-26 23:09:30 -04:00
{
success = true;
Factor out grid beat divisions.
2015-01-07 18:30:25 -05:00
const unsigned divisions = get_grid_beat_divisions(position);
if (divisions) {
convert codebase to use Temporal for various time types
2017-09-24 12:03:54 -04:00
return Temporal::Beats(1.0 / (double)get_grid_beat_divisions(position));
Factor out grid beat divisions.
2015-01-07 18:30:25 -05:00
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
switch (_grid_type) {
case GridTypeBeat:
convert codebase to use Temporal for various time types
2017-09-24 12:03:54 -04:00
return Temporal::Beats(4.0 / _session->tempo_map().meter_at_sample (position).note_divisor());
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
case GridTypeBar:
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
const Meter& m = _session->tempo_map().meter_at_sample (position);
convert codebase to use Temporal for various time types
2017-09-24 12:03:54 -04:00
return Temporal::Beats((4.0 * m.divisions_per_bar()) / m.note_divisor());
lots of MIDI editing stuff. to be explained on the website when its done git-svn-id: svn://localhost/ardour2/branches/3.0@5596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-26 23:09:30 -04:00
}
break;
default:
success = false;
break;
}
convert codebase to use Temporal for various time types
2017-09-24 12:03:54 -04:00
return Temporal::Beats();
lots of MIDI editing stuff. to be explained on the website when its done git-svn-id: svn://localhost/ardour2/branches/3.0@5596 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-08-26 23:09:30 -04:00
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplecnt_t
Editor::get_nudge_distance (samplepos_t pos, samplecnt_t& next)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplecnt_t ret;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 13:50:37 -04:00
ret = nudge_clock->current_duration (pos);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
next = ret + 1; /* XXXX fix me */
return ret;
}
int
Merged with trunk R1283. NOTE: Compiles, but broken (crash on adding MIDI track). git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 18:24:54 -05:00
Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
A little copy-editing. git-svn-id: svn://localhost/ardour2/branches/3.0@7046 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-02 19:54:25 -04:00
ArdourDialog dialog (_("Playlist Deletion"));
fix compose mess, and a number of 64 bit printf specs git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-10-06 15:10:57 -04:00
Label label (string_compose (_("Playlist %1 is currently unused.\n"
Tinker with text related to clean-up. git-svn-id: svn://localhost/ardour2/branches/3.0@9459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-02 19:21:53 -04:00
"If it is kept, its audio files will not be cleaned.\n"
"If it is deleted, audio files used by it alone will be cleaned."),
Merged with trunk R1283. NOTE: Compiles, but broken (crash on adding MIDI track). git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 18:24:54 -05:00
pl->name()));
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
lots of small fixes for various irritations, return of snapshots, region list hiding stuff, etc etc etc git-svn-id: svn://localhost/trunk/ardour2@241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 22:18:44 -05:00
dialog.set_position (WIN_POS_CENTER);
slowly fixing up ArdourDialog nonsense git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 16:17:41 -05:00
dialog.get_vbox()->pack_start (label);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
Merged with trunk R1283. NOTE: Compiles, but broken (crash on adding MIDI track). git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-09 18:24:54 -05:00
label.show ();
cont'd 20262abe (GUI to keep all playlists)
2015-11-21 16:45:43 -05:00
dialog.add_button (_("Delete All Unused"), RESPONSE_YES); // needs clarification. this and all remaining ones
Tinker with text related to clean-up. git-svn-id: svn://localhost/ardour2/branches/3.0@9459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-05-02 19:21:53 -04:00
dialog.add_button (_("Delete Playlist"), RESPONSE_ACCEPT);
safe default button focus for deleting playlists
2016-01-05 09:48:35 -05:00
Button* keep = dialog.add_button (_("Keep Playlist"), RESPONSE_REJECT);
cont'd 20262abe (GUI to keep all playlists)
2015-11-21 16:45:43 -05:00
dialog.add_button (_("Keep Remaining"), RESPONSE_NO); // ditto
slowly fixing up ArdourDialog nonsense git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 16:17:41 -05:00
dialog.add_button (_("Cancel"), RESPONSE_CANCEL);
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* by default gtk uses the left most button */
safe default button focus for deleting playlists
2016-01-05 09:48:35 -05:00
keep->grab_focus ();
slowly fixing up ArdourDialog nonsense git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 16:17:41 -05:00
switch (dialog.run ()) {
cont'd 20262abe (GUI to keep all playlists)
2015-11-21 16:45:43 -05:00
case RESPONSE_NO:
/* keep this and all remaining ones */
return -2;
break;
GUI support for "Delete All Unused" playlists.
2015-11-21 15:12:17 -05:00
case RESPONSE_YES:
/* delete this and all others */
return 2;
break;
slowly fixing up ArdourDialog nonsense git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 16:17:41 -05:00
case RESPONSE_ACCEPT:
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
/* delete the playlist */
GUI support for "Delete All Unused" playlists.
2015-11-21 15:12:17 -05:00
return 1;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
break;
slowly fixing up ArdourDialog nonsense git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 16:17:41 -05:00
case RESPONSE_REJECT:
/* keep the playlist */
GUI support for "Delete All Unused" playlists.
2015-11-21 15:12:17 -05:00
return 0;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
break;
slowly fixing up ArdourDialog nonsense git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 16:17:41 -05:00
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
default:
compiles and runs, but crashes ... duh git-svn-id: svn://localhost/trunk/ardour2@113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-25 19:06:46 -05:00
break;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
compiles and runs, but crashes ... duh git-svn-id: svn://localhost/trunk/ardour2@113 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-25 19:06:46 -05:00
slowly fixing up ArdourDialog nonsense git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-11-27 16:17:41 -05:00
return -1;
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
bool
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::audio_region_selection_covers (samplepos_t where)
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
{
Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and associated stuff are now separated (with common things in base classes). Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses all look (and really are) distinct in the GUI. git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 08:03:19 -04:00
for (RegionSelection::iterator a = selection->regions.begin(); a != selection->regions.end(); ++a) {
Merged with trunk R861 Possible new bugs - not very thoroughly tested, but at least functional at first glance git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-08-29 17:21:48 -04:00
if ((*a)->region()->covers (where)) {
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
return true;
}
}
return false;
}
(Source List) Source list, Region List: Resolve various action+behaviors between the 2 lists. Duplicate the remove_unsued_region action in the Session->Cleanup menu, for discoverability. Region list should use the same Region actions as the canvas... OK, now resolve the change in use-cases of Region List and Source List. tentative. Rough-in remove_selected_sources (Delete in Sources list). Column tweaks.
2018-10-22 17:46:44 -04:00
void
Editor::cleanup_regions ()
{
_regions->remove_unused_regions();
}
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
void
Editor::prepare_for_cleanup ()
{
Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and associated stuff are now separated (with common things in base classes). Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses all look (and really are) distinct in the GUI. git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 08:03:19 -04:00
cut_buffer->clear_regions ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
cut_buffer->clear_playlists ();
Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and associated stuff are now separated (with common things in base classes). Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses all look (and really are) distinct in the GUI. git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-07-23 08:03:19 -04:00
selection->clear_regions ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
selection->clear_playlists ();
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
_regions->suspend_redisplay ();
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
void
Editor::finish_cleanup ()
{
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
_regions->resume_redisplay ();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
}
Location*
Editor::transport_loop_location()
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session) {
return _session->locations()->auto_loop_location();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
} else {
return 0;
}
}
Location*
Editor::transport_punch_location()
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session) {
return _session->locations()->auto_punch_location();
Initial import of gtk2_ardour. git-svn-id: svn://localhost/trunk/ardour2@24 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-09-25 14:42:24 -04:00
} else {
return 0;
}
}
A possible method for correctly sizing the editor controls, and a couple buttons fixed git-svn-id: svn://localhost/trunk/ardour2@195 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-17 08:39:27 -05:00
use scroll handling instead of button 4/5 (incomplete) git-svn-id: svn://localhost/trunk/ardour2@204 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-23 10:34:02 -05:00
bool
Editor::control_layout_scroll (GdkEventScroll* ev)
{
forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
2014-06-09 10:02:38 -04:00
/* Just forward to the normal canvas scroll method. The coordinate
systems are different but since the canvas is always larger than the
track headers, and aligned with the trackview area, this will work.
use scroll handling instead of button 4/5 (incomplete) git-svn-id: svn://localhost/trunk/ardour2@204 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-23 10:34:02 -05:00
forward scroll events from track control headers to the canvas, to get consistent scroll behaviour (whatever that behaviour is)
2014-06-09 10:02:38 -04:00
In the not too distant future this layout is going away anyway and
headers will be on the canvas.
*/
fix scrolling behaviour in track headers (event was stolen by rulers because event coordinates made it look as if the event happened there)
2014-06-13 14:27:59 -04:00
return canvas_scroll_event (ev, false);
Adjusted some font sizes git-svn-id: svn://localhost/trunk/ardour2@199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2005-12-21 16:15:37 -05:00
}
lots of small fixes for various irritations, return of snapshots, region list hiding stuff, etc etc etc git-svn-id: svn://localhost/trunk/ardour2@241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 22:18:44 -05:00
void
fix a variety of unused argument errors noted by gcc 4.3.2 on x86 git-svn-id: svn://localhost/ardour2/branches/3.0@7733 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-02 13:01:36 -04:00
Editor::session_state_saved (string)
lots of small fixes for various irritations, return of snapshots, region list hiding stuff, etc etc etc git-svn-id: svn://localhost/trunk/ardour2@241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 22:18:44 -05:00
{
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
update_title ();
Pull snapshots code out of Editor class. git-svn-id: svn://localhost/ardour2/branches/3.0@5313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 19:51:58 -04:00
_snapshots->redisplay ();
lots of small fixes for various irritations, return of snapshots, region list hiding stuff, etc etc etc git-svn-id: svn://localhost/trunk/ardour2@241 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-04 22:18:44 -05:00
}
Much simplier implementation of: "Show Toolbar" act immediately, i.e., even when already maximized, changing this toggle changes whenever toolbar is shown or not. git-svn-id: svn://localhost/ardour2/branches/3.0@12695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 00:21:46 -04:00
void
Editor::maximise_editing_space ()
{
if (_maximised) {
return;
}
remove use of current_toplevel() where unnecessary, fix broken necessary cases, generally fix up show/hide/attach/detach for Tabbables
2015-07-22 17:49:41 -04:00
Gtk::Window* toplevel = current_toplevel();
Add a clock to the menu bar in full-screen mode. Fixes #1273. git-svn-id: svn://localhost/ardour2/branches/3.0@8024 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 08:48:24 -05:00
remove use of current_toplevel() where unnecessary, fix broken necessary cases, generally fix up show/hide/attach/detach for Tabbables
2015-07-22 17:49:41 -04:00
if (toplevel) {
toplevel->fullscreen ();
_maximised = true;
}
Fix vertical pane resizing during fullscreen/unfullscreen (#4119). git-svn-id: svn://localhost/ardour2/branches/3.0@9889 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 14:22:43 -04:00
}
F11 now toggles maximal editor space git-svn-id: svn://localhost/trunk/ardour2@280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-19 13:05:31 -05:00
void
Much simplier implementation of: "Show Toolbar" act immediately, i.e., even when already maximized, changing this toggle changes whenever toolbar is shown or not. git-svn-id: svn://localhost/ardour2/branches/3.0@12695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 00:21:46 -04:00
Editor::restore_editing_space ()
F11 now toggles maximal editor space git-svn-id: svn://localhost/trunk/ardour2@280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-19 13:05:31 -05:00
{
Much simplier implementation of: "Show Toolbar" act immediately, i.e., even when already maximized, changing this toggle changes whenever toolbar is shown or not. git-svn-id: svn://localhost/ardour2/branches/3.0@12695 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-13 00:21:46 -04:00
if (!_maximised) {
dramatically simplify maximi[sz]ation code, ripping out all the old pane sizing stuff that seems to be a left over from gtk1 (!) git-svn-id: svn://localhost/ardour2/branches/3.0@11344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 22:03:25 -05:00
return;
Reduce default summary size and remember it across saves. Fixes #3205. git-svn-id: svn://localhost/ardour2/branches/3.0@7243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-07 21:29:33 -04:00
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
remove use of current_toplevel() where unnecessary, fix broken necessary cases, generally fix up show/hide/attach/detach for Tabbables
2015-07-22 17:49:41 -04:00
Gtk::Window* toplevel = current_toplevel();
Merged with trunk R1141 git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-11-19 11:45:16 -05:00
remove use of current_toplevel() where unnecessary, fix broken necessary cases, generally fix up show/hide/attach/detach for Tabbables
2015-07-22 17:49:41 -04:00
if (toplevel) {
toplevel->unfullscreen();
_maximised = false;
}
F11 now toggles maximal editor space git-svn-id: svn://localhost/trunk/ardour2@280 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-01-19 13:05:31 -05:00
}
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
Fix things so that selecting a region always selects equivalent regions in the same edit group, even if the appropriate tracks aren't selected at the time. git-svn-id: svn://localhost/ardour2/trunk@2523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-06 12:24:08 -04:00
/**
* Make new playlists for a given track and also any others that belong
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
* to the same active route group with the `select' property.
Fix things so that selecting a region always selects equivalent regions in the same edit group, even if the appropriate tracks aren't selected at the time. git-svn-id: svn://localhost/ardour2/trunk@2523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-06 12:24:08 -04:00
* @param v Track.
*/
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::new_playlists (TimeAxisView* v)
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
{
begin_reversible_command (_("new playlists"));
Added take system from 2.0. Thanks to torben for the patch. git-svn-id: svn://localhost/ardour2/branches/3.0@3873 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-06 14:04:12 -04:00
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
Update GUI, use Session::playlists() getter (2/2)
2019-03-19 00:14:40 -04:00
_session->playlists()->get (playlists);
use new RouteGroup property names
2016-06-05 15:54:37 -04:00
mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, ARDOUR::Properties::group_select.property_id);
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
commit_reversible_command ();
}
Fix things so that selecting a region always selects equivalent regions in the same edit group, even if the appropriate tracks aren't selected at the time. git-svn-id: svn://localhost/ardour2/trunk@2523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-06 12:24:08 -04:00
/**
* Use a copy of the current playlist for a given track and also any others that belong
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
* to the same active route group with the `select' property.
Fix things so that selecting a region always selects equivalent regions in the same edit group, even if the appropriate tracks aren't selected at the time. git-svn-id: svn://localhost/ardour2/trunk@2523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-06 12:24:08 -04:00
* @param v Track.
*/
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::copy_playlists (TimeAxisView* v)
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
{
begin_reversible_command (_("copy playlists"));
Added take system from 2.0. Thanks to torben for the patch. git-svn-id: svn://localhost/ardour2/branches/3.0@3873 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-06 14:04:12 -04:00
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
Update GUI, use Session::playlists() getter (2/2)
2019-03-19 00:14:40 -04:00
_session->playlists()->get (playlists);
use new RouteGroup property names
2016-06-05 15:54:37 -04:00
mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, ARDOUR::Properties::group_select.property_id);
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
commit_reversible_command ();
}
Various adjustments to make more operations respect the Edit property on route groups. git-svn-id: svn://localhost/ardour2/branches/3.0@5273 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-25 16:58:32 -04:00
/** Clear the current playlist for a given track and also any others that belong
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
* to the same active route group with the `select' property.
Fix things so that selecting a region always selects equivalent regions in the same edit group, even if the appropriate tracks aren't selected at the time. git-svn-id: svn://localhost/ardour2/trunk@2523 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-06 12:24:08 -04:00
* @param v Track.
*/
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::clear_playlists (TimeAxisView* v)
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
{
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
begin_reversible_command (_("clear playlists"));
Added take system from 2.0. Thanks to torben for the patch. git-svn-id: svn://localhost/ardour2/branches/3.0@3873 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-06 14:04:12 -04:00
vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
Update GUI, use Session::playlists() getter (2/2)
2019-03-19 00:14:40 -04:00
_session->playlists()->get (playlists);
use new RouteGroup property names
2016-06-05 15:54:37 -04:00
mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, ARDOUR::Properties::group_select.property_id);
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
commit_reversible_command ();
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::mapped_use_new_playlist (RouteTimeAxisView& atv, uint32_t sz, vector<boost::shared_ptr<ARDOUR::Playlist> > const & playlists)
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
{
cont'd work to prevent duplicate playlist names
2016-11-25 08:24:15 -05:00
atv.use_new_playlist (sz > 1 ? false : true, playlists, false);
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
}
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::mapped_use_copy_playlist (RouteTimeAxisView& atv, uint32_t sz, vector<boost::shared_ptr<ARDOUR::Playlist> > const & playlists)
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
{
cont'd work to prevent duplicate playlist names
2016-11-25 08:24:15 -05:00
atv.use_new_playlist (sz > 1 ? false : true, playlists, true);
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
void
Fix some unused parameter warnings. git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 11:55:17 -04:00
Editor::mapped_clear_playlist (RouteTimeAxisView& atv, uint32_t /*sz*/)
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
{
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
atv.clear_playlist ();
fix for deferred saves by StateManager-derivatives; changes to new/copy/clear playlist ops (not finished), TRUE/FALSE -> true/false in editor_mouse.cc git-svn-id: svn://localhost/trunk/ardour2@358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-07 21:50:53 -05:00
}
new mix group interface, not yet finished and still to propagate to edit_group git-svn-id: svn://localhost/trunk/ardour2@366 d708f5d6-7413-0410-9779-e7cbd77b26cf
2006-03-09 18:44:39 -05:00
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
double
Editor::get_y_origin () const
{
return vertical_adjustment.get_value ();
}
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
/** Queue up a change to the viewport x origin.
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
* @param sample New x origin.
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
*/
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::reset_x_origin (samplepos_t sample)
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
{
Remove indirected method calls. git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:22 -04:00
pending_visual_change.add (VisualChange::TimeOrigin);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
pending_visual_change.time_origin = sample;
Remove indirected method calls. git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:22 -04:00
ensure_visual_change_idle_handler ();
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
}
Various fixes and improvements to editor summary widget. git-svn-id: svn://localhost/ardour2/branches/3.0@5179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-13 13:52:51 -04:00
void
Editor::reset_y_origin (double y)
{
Remove indirected method calls. git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:22 -04:00
pending_visual_change.add (VisualChange::YOrigin);
pending_visual_change.y_origin = y;
ensure_visual_change_idle_handler ();
Various fixes and improvements to editor summary widget. git-svn-id: svn://localhost/ardour2/branches/3.0@5179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-13 13:52:51 -04:00
}
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::reset_zoom (samplecnt_t spp)
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
{
switch samples_per_pixel to integer type
2013-06-18 23:02:54 -04:00
if (spp == samples_per_pixel) {
Unify clamping of frames-per-unit values during zoom; should help with #3514. git-svn-id: svn://localhost/ardour2/branches/3.0@12796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:27 -04:00
return;
}
Remove indirected method calls. git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:22 -04:00
pending_visual_change.add (VisualChange::ZoomLevel);
switch samples_per_pixel to integer type
2013-06-18 23:02:54 -04:00
pending_visual_change.samples_per_pixel = spp;
Remove indirected method calls. git-svn-id: svn://localhost/ardour2/branches/3.0@12795 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:22 -04:00
ensure_visual_change_idle_handler ();
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
}
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::reposition_and_zoom (samplepos_t sample, double fpu)
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
{
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
reset_x_origin (sample);
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
reset_zoom (fpu);
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
if (!no_save_visual) {
undo_visual_stack.push_back (current_visual_state(false));
}
}
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
Editor::VisualState::VisualState (bool with_tracks)
: gui_state (with_tracks ? new GUIObjectState : 0)
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
{
}
Editor::VisualState::~VisualState ()
{
delete gui_state;
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
Editor::VisualState*
Editor::current_visual_state (bool with_tracks)
{
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
VisualState* vs = new VisualState (with_tracks);
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
vs->y_position = vertical_adjustment.get_value();
change frames_per_pixel to samples_per_pixel
2013-04-12 11:31:50 -04:00
vs->samples_per_pixel = samples_per_pixel;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
vs->_leftmost_sample = _leftmost_sample;
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
vs->zoom_focus = zoom_focus;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
if (with_tracks) {
fix crash when loading a saved visual state
2016-07-05 17:49:50 -04:00
vs->gui_state->set_state (ARDOUR_UI::instance()->gui_object_state->get_state());
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
return vs;
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
}
void
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
Editor::undo_visual_state ()
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
{
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
if (undo_visual_stack.empty()) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
return;
}
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
VisualState* vs = undo_visual_stack.back();
undo_visual_stack.pop_back();
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
redo_visual_stack.push_back (current_visual_state (vs ? vs->gui_state != 0 : false));
NULL pointer dereference?
2014-11-16 21:58:05 -05:00
if (vs) {
use_visual_state (*vs);
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
void
Editor::redo_visual_state ()
{
if (redo_visual_stack.empty()) {
return;
}
VisualState* vs = redo_visual_stack.back();
redo_visual_stack.pop_back();
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* XXX: can 'vs' really be 0? Is there a place that puts NULL pointers onto the stack? */
NULL pointer dereference?
2014-11-16 21:58:05 -05:00
undo_visual_stack.push_back (current_visual_state (vs ? (vs->gui_state != 0) : false));
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
NULL pointer dereference?
2014-11-16 21:58:05 -05:00
if (vs) {
use_visual_state (*vs);
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
void
Editor::swap_visual_state ()
{
if (undo_visual_stack.empty()) {
redo_visual_state ();
} else {
undo_visual_state ();
}
}
void
Editor::use_visual_state (VisualState& vs)
{
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
PBD::Unwinder<bool> nsv (no_save_visual, true);
suspend route redisplay for (rec-en, solo, mute and monitor) batch changes
2014-06-28 20:52:56 -04:00
DisplaySuspender ds;
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
vertical_adjustment.set_value (vs.y_position);
set_zoom_focus (vs.zoom_focus);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
reposition_and_zoom (vs._leftmost_sample, vs.samples_per_pixel);
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
if (vs.gui_state) {
fix crash when loading a saved visual state
2016-07-05 17:49:50 -04:00
ARDOUR_UI::instance()->gui_object_state->set_state (vs.gui_state->get_state());
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
fix visual undo. TODO: Check if it’s feasible/required to add a GUIPropertiesChanged signal and have axis-views subscribe to it.
2015-03-21 11:50:47 -04:00
(*i)->clear_property_cache();
fix up a substantial mess with the operation of toggle-zoom and related actions, partially caused by XMLNode semantics fixed in a previous commit, but partially caused by issues fixed here git-svn-id: svn://localhost/ardour2/branches/3.0@11614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-06 21:11:59 -05:00
(*i)->reset_visual_state ();
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
fix a few things related to fit-to-tracks and toggle-visual-state (from 2.0) git-svn-id: svn://localhost/ardour2/branches/3.0@3967 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-14 10:20:29 -04:00
introduce GUIObjectState; massive, pervasive changes in visibility and height management for track displays in the editor git-svn-id: svn://localhost/ardour2/branches/3.0@9796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-06 20:37:13 -04:00
_routes->update_visibility ();
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
}
Unify clamping of frames-per-unit values during zoom; should help with #3514. git-svn-id: svn://localhost/ardour2/branches/3.0@12796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:27 -04:00
/** This is the core function that controls the zoom level of the canvas. It is called
* whenever one or more calls are made to reset_zoom(). It executes in an idle handler.
simplify zooming, remove Editor::clamp_samples_per_pixel(), fix getting "stuck" at max and min zoom levels
2014-07-02 15:53:24 -04:00
* @param spp new number of samples per pixel
Unify clamping of frames-per-unit values during zoom; should help with #3514. git-svn-id: svn://localhost/ardour2/branches/3.0@12796 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 10:14:27 -04:00
*/
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::set_samples_per_pixel (samplecnt_t spp)
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
{
simplify zooming, remove Editor::clamp_samples_per_pixel(), fix getting "stuck" at max and min zoom levels
2014-07-02 15:53:24 -04:00
if (spp < 1) {
return;
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
const samplecnt_t three_days = 3 * 24 * 60 * 60 * (_session ? _session->sample_rate() : 48000);
const samplecnt_t lots_of_pixels = 4000;
simplify zooming, remove Editor::clamp_samples_per_pixel(), fix getting "stuck" at max and min zoom levels
2014-07-02 15:53:24 -04:00
/* if the zoom level is greater than what you'd get trying to display 3
* days of audio on a really big screen, then it's too big.
*/
if (spp * lots_of_pixels > three_days) {
return;
}
switch samples_per_pixel to integer type
2013-06-18 23:02:54 -04:00
samples_per_pixel = spp;
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
}
switch samples_per_pixel to integer type
2013-06-18 23:02:54 -04:00
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
void
Editor::on_samples_per_pixel_changed ()
{
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again. git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-26 17:43:10 -05:00
bool const showing_time_selection = selection->time.length() > 0;
Reshow time selection when zooming in object-range mode (#4678). git-svn-id: svn://localhost/ardour2/branches/3.0@11754 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-25 08:12:08 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (showing_time_selection && selection->time.start () != selection->time.end_sample ()) {
Remove confusing track / group members in TimeSelection struct; time selection applies to the selected tracks. Some tinkering with how tracks are selected during time selections. git-svn-id: svn://localhost/ardour2/branches/3.0@6360 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 16:27:19 -05:00
for (TrackViewList::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
(*i)->reshow_selection (selection->time);
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
}
}
ZoomChanged (); /* EMIT_SIGNAL */
handle enter/leave items when zooming and scrolling occur
2013-10-31 03:10:18 -04:00
ArdourCanvas::GtkCanvasViewport* c;
c = get_track_canvas();
if (c) {
c->canvas()->zoomed ();
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
merge 2.0-ongoing into 3.0 @ 3581 - 3710 git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 17:27:39 -04:00
if (playhead_cursor) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
playhead_cursor->set_position (playhead_cursor->current_sample ());
merge 2.0-ongoing into 3.0 @ 3581 - 3710 git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 17:27:39 -04:00
}
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
editor toggle button fix from lincoln; refresh location display when loop range changes; fix up BufferSet::merge_from() to be less fragile to wierd merge conditions git-svn-id: svn://localhost/ardour2/branches/3.0@5297 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-29 10:29:53 -04:00
refresh_location_display();
Add a playhead marker to the summary. git-svn-id: svn://localhost/ardour2/branches/3.0@5206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-16 20:29:56 -04:00
_summary->set_overlays_dirty ();
Add a widget giving an overview of the editor, as (what I think is being) suggested in #2714. Many caveats: most notably that it looks quite ugly and you can't (yet) turn it off. git-svn-id: svn://localhost/ardour2/branches/3.0@5162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-10 21:05:01 -04:00
Prevent marker labels overlapping. Fixes #3535. git-svn-id: svn://localhost/ardour2/branches/3.0@8015 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-12 17:51:54 -05:00
update_marker_labels ();
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
instant_save ();
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t
Add API to query editor's playhead cursor position
2016-12-16 09:02:29 -05:00
Editor::playhead_cursor_sample () const
{
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
return playhead_cursor->current_sample();
Add API to query editor's playhead cursor position
2016-12-16 09:02:29 -05:00
}
videotimline squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-12 17:00:09 -04:00
void
Editor::queue_visual_videotimeline_update ()
{
Add explicit VideoTimeline change-type, follow up on f73ce2d
2017-06-28 12:46:07 -04:00
pending_visual_change.add (VisualChange::VideoTimeline);
videotimline squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-12 17:00:09 -04:00
ensure_visual_change_idle_handler ();
}
A few cleanups. Map scroll wheel to movement of the viewport. git-svn-id: svn://localhost/ardour2/branches/3.0@5197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-15 18:45:05 -04:00
void
Editor::ensure_visual_change_idle_handler ()
{
Various fixes and improvements to editor summary widget. git-svn-id: svn://localhost/ardour2/branches/3.0@5179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-13 13:52:51 -04:00
if (pending_visual_change.idle_handler_id < 0) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* see comment in add_to_idle_resize above. */
fix typo in 58fec98a the documentation was correct: “GTK+ uses G_PRIORITY_HIGH_IDLE + 10 for resizing operations, and G_PRIORITY_HIGH_IDLE + 20 for redrawing operations.” but the priority for the idle visual changer was wrong. fixes, follow-playhead and zoom/scrolling under load (no idle)
2014-10-29 13:31:13 -04:00
pending_visual_change.idle_handler_id = g_idle_add_full (G_PRIORITY_HIGH_IDLE + 10, _idle_visual_changer, this, NULL);
commit immediately post linking
2013-04-04 18:45:27 -04:00
pending_visual_change.being_handled = false;
A few cleanups. Map scroll wheel to movement of the viewport. git-svn-id: svn://localhost/ardour2/branches/3.0@5197 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-15 18:45:05 -04:00
}
Various fixes and improvements to editor summary widget. git-svn-id: svn://localhost/ardour2/branches/3.0@5179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-13 13:52:51 -04:00
}
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
int
Editor::_idle_visual_changer (void* arg)
{
return static_cast<Editor*>(arg)->idle_visual_changer ();
}
Coalesce visual changes to canvas/items and allow canvas to render First visual change will be processed as normal and then blocked until the canvas renders the change. If further visual changes need processing then Editor::pre_render callback will schedule another expose/redraw/render. This prevents an issue where idle_visual_changer is called many times in response to events(keys/motion/etc) but the canvas does not get a chance to render any but the last one which results in a big pause/jump. This results in a more responsive canvas and in particular a smoother and more predictable zooming experience.
2017-04-01 07:33:59 -04:00
void
Editor::pre_render ()
{
visual_change_queued = false;
if (pending_visual_change.pending != 0) {
ensure_visual_change_idle_handler();
}
}
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
int
Editor::idle_visual_changer ()
{
Reset idle_handler_id (fixes idle zoom -- bug in 265f52535a7) If pending_visual_change.pending was zero when calling idle_visual_changer the handler_id was never reset. and the idle-handler was never called again.
2017-06-28 12:42:10 -04:00
pending_visual_change.idle_handler_id = -1;
Coalesce visual changes to canvas/items and allow canvas to render First visual change will be processed as normal and then blocked until the canvas renders the change. If further visual changes need processing then Editor::pre_render callback will schedule another expose/redraw/render. This prevents an issue where idle_visual_changer is called many times in response to events(keys/motion/etc) but the canvas does not get a chance to render any but the last one which results in a big pause/jump. This results in a more responsive canvas and in particular a smoother and more predictable zooming experience.
2017-04-01 07:33:59 -04:00
if (pending_visual_change.pending == 0) {
return 0;
}
Allow new idle visual changer calls to be requested while the current changer is executing; fixes #4567. git-svn-id: svn://localhost/ardour2/branches/3.0@12934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 20:07:45 -04:00
/* set_horizontal_position() below (and maybe other calls) call
gtk_main_iteration(), so it's possible that a signal will be handled
half-way through this method. If this signal wants an
idle_visual_changer we must schedule another one after this one, so
mark the idle_handler_id as -1 here to allow that. Also make a note
that we are doing the visual change, so that changes in response to
super-rapid-screen-update can be dropped if we are still processing
the last one.
*/
try another fix for the crash created by rev 13547 git-svn-id: svn://localhost/ardour2/branches/3.0@13554 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27 08:21:21 -05:00
Coalesce visual changes to canvas/items and allow canvas to render First visual change will be processed as normal and then blocked until the canvas renders the change. If further visual changes need processing then Editor::pre_render callback will schedule another expose/redraw/render. This prevents an issue where idle_visual_changer is called many times in response to events(keys/motion/etc) but the canvas does not get a chance to render any but the last one which results in a big pause/jump. This results in a more responsive canvas and in particular a smoother and more predictable zooming experience.
2017-04-01 07:33:59 -04:00
if (visual_change_queued) {
return 0;
}
Allow new idle visual changer calls to be requested while the current changer is executing; fixes #4567. git-svn-id: svn://localhost/ardour2/branches/3.0@12934 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-25 20:07:45 -04:00
pending_visual_change.being_handled = true;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
VisualChange vc = pending_visual_change;
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
pending_visual_change.pending = (VisualChange::Type) 0;
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
visual_changer (vc);
Only compute and render the visible portion of crossfades. Fixes #3498. git-svn-id: svn://localhost/ardour2/branches/3.0@7901 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-17 19:35:05 -04:00
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
pending_visual_change.being_handled = false;
fix zoom focus issue that was messing up zoom changes
2013-06-25 21:56:10 -04:00
Coalesce visual changes to canvas/items and allow canvas to render First visual change will be processed as normal and then blocked until the canvas renders the change. If further visual changes need processing then Editor::pre_render callback will schedule another expose/redraw/render. This prevents an issue where idle_visual_changer is called many times in response to events(keys/motion/etc) but the canvas does not get a chance to render any but the last one which results in a big pause/jump. This results in a more responsive canvas and in particular a smoother and more predictable zooming experience.
2017-04-01 07:33:59 -04:00
visual_change_queued = true;
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
return 0; /* this is always a one-shot call */
}
void
Editor::visual_changer (const VisualChange& vc)
{
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
/**
* Changed first so the correct horizontal canvas position is calculated in
* Editor::set_horizontal_position
*/
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
if (vc.pending & VisualChange::ZoomLevel) {
set_samples_per_pixel (vc.samples_per_pixel);
videotimline squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-12 17:00:09 -04:00
}
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
if (vc.pending & VisualChange::TimeOrigin) {
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
double new_time_origin = sample_to_pixel_unrounded (vc.time_origin);
set_horizontal_position (new_time_origin);
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
}
videotimline squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-12 17:00:09 -04:00
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
if (vc.pending & VisualChange::YOrigin) {
vertical_adjustment.set_value (vc.y_origin);
Various fixes and improvements to editor summary widget. git-svn-id: svn://localhost/ardour2/branches/3.0@5179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-13 13:52:51 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
/**
* Now the canvas is in the final state before render the canvas items that
* support the Item::prepare_for_render interface can calculate the correct
* item to visible canvas intersection.
*/
if (vc.pending & VisualChange::ZoomLevel) {
on_samples_per_pixel_changed ();
compute_fixed_ruler_scale ();
compute_bbt_ruler_scale (vc.time_origin, pending_visual_change.time_origin + current_page_samples());
update_tempo_based_rulers ();
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
}
enable videotimeline by default
2013-04-11 13:49:29 -04:00
big rework of scrolling, horizontal part considered almost 100% done. Many more changes than I would typically like in a single commit, but this was all very intertwined. Vertical scrolling using track-stepping still to follow.
2014-03-20 13:29:29 -04:00
if (!(vc.pending & VisualChange::ZoomLevel)) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* If the canvas is not being zoomed then the canvas items will not change
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
* and cause Item::prepare_for_render to be called so do it here manually.
* Not ideal, but I can't think of a better solution atm.
*/
_track_canvas->prepare_for_render();
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* If we are only scrolling vertically there is no need to update these */
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
if (vc.pending != VisualChange::YOrigin) {
update_fixed_rulers ();
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
redisplay_grid (true);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Add explicit VideoTimeline change-type, follow up on f73ce2d
2017-06-28 12:46:07 -04:00
/* video frames & position need to be updated for zoom, horiz-scroll
* and (explicitly) VisualChange::VideoTimeline.
*/
update_video_timeline();
}
Changes to Editor::visual_changer to support Item/Canvas::prepare_for_render This is necessary to allow calculation of correct intersection of visible canvas area and items for the new Item::prepare_for_render() API. samples_per_pixel must be set first to calculate the new horizontal canvas position in Editor::set_horizontal_position and then WaveView::set_samples_per_pixel will eventually call WaveView::prepare_for_render for those items that are visible on the new canvas position at the new position. Or if there is not a change to zoom state then call Canvas::prepare_for_render explicitly. Also changes so that each method is only called once during Editor::visual_changer
2017-03-26 23:26:58 -04:00
Add a playhead marker to the summary. git-svn-id: svn://localhost/ardour2/branches/3.0@5206 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-16 20:29:56 -04:00
_summary->set_overlays_dirty ();
Merged with trunk R1311. git-svn-id: svn://localhost/ardour2/branches/midi@1312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-11 15:36:35 -05:00
}
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
struct EditorOrderTimeAxisSorter {
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
bool operator() (const TimeAxisView* a, const TimeAxisView* b) const {
Cleanups and a few comments. git-svn-id: svn://localhost/ardour2/branches/3.0@4374 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-01-01 19:17:55 -05:00
return a->order () < b->order ();
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
}
};
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
void
fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id() git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 14:20:15 -05:00
Editor::sort_track_selection (TrackViewList& sel)
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
{
EditorOrderTimeAxisSorter cmp;
fix for most (all? we can dream ...) issues involved in #4399 (editing multiply-applies operations to playlists used more than once), and as a side-issue, fix playlist selection which broke when we hid Diskstreams inside Tracks by using orig_track_id() rather than orig_diskstream_id() git-svn-id: svn://localhost/ardour2/branches/3.0@10968 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-10 14:20:15 -05:00
sel.sort (cmp);
Merged with trunk R1393. git-svn-id: svn://localhost/ardour2/branches/midi@1395 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-01-28 12:44:13 -05:00
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t
minor tweaks to Cut Time dialog. Use an enum to tell preferred_edit_location what to ignore, so cut and insert dialogs will never use mouse location.
2013-10-20 17:02:56 -04:00
Editor::get_preferred_edit_position (EditIgnoreOption ignore, bool from_context_menu, bool from_outside_canvas)
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
{
bool ignored;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t where = 0;
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
EditPoint ep = _edit_point;
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
braces, please
2016-12-08 04:44:26 -05:00
if (Profile->get_mixbus()) {
if (ep == EditAtSelectedMarker) {
A few whitespace fixes A few trivial whitesapce fixes, including replacing leading spaces with tabs in editor.h.
2015-02-03 14:33:22 -05:00
ep = EditAtPlayhead;
braces, please
2016-12-08 04:44:26 -05:00
}
}
Start step entry at playhead.
2015-01-07 20:46:21 -05:00
if (from_outside_canvas && (ep == EditAtMouse)) {
ep = EditAtPlayhead;
} else if (from_context_menu && (ep == EditAtMouse)) {
no-op - comment/whitespace fixes.
2017-03-04 13:34:41 -05:00
return canvas_event_sample (&context_click_event, 0, 0);
centralize use of "from-context-menu" in Editor::get_preferred_edit_position(), and use it when pasting as well git-svn-id: svn://localhost/ardour2/branches/3.0@11118 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-30 12:28:05 -05:00
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
if (entered_marker) {
NO-OP whitespace (updated GH PR #357)
2017-07-01 12:42:24 -04:00
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use entered marker @ %1\n", entered_marker->position()));
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
return entered_marker->position();
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if ((ignore == EDIT_IGNORE_PHEAD) && ep == EditAtPlayhead) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
ep = EditAtSelectedMarker;
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if ((ignore == EDIT_IGNORE_MOUSE) && ep == EditAtMouse) {
minor tweaks to Cut Time dialog. Use an enum to tell preferred_edit_location what to ignore, so cut and insert dialogs will never use mouse location.
2013-10-20 17:02:56 -04:00
ep = EditAtPlayhead;
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
MusicSample snap_mf (0, 0);
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
switch (ep) {
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
case EditAtPlayhead:
Reinstate the ability to split regions while dragging playhead. I think this was unintentionally lost.
2018-02-27 14:08:40 -05:00
if (_dragging_playhead) {
/* NOTE: since the user is dragging with the mouse, this operation will implicitly be Snapped */
where = playhead_cursor->current_sample();
A few whitespace fixes A few trivial whitesapce fixes, including replacing leading spaces with tabs in editor.h.
2015-02-03 14:33:22 -05:00
} else {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
where = _session->audible_sample();
A few whitespace fixes A few trivial whitesapce fixes, including replacing leading spaces with tabs in editor.h.
2015-02-03 14:33:22 -05:00
}
NO-OP whitespace (updated GH PR #357)
2017-07-01 12:42:24 -04:00
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where));
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
break;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
case EditAtSelectedMarker:
if (!selection->markers.empty()) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
bool is_start;
Location* loc = find_location_from_marker (selection->markers.front(), is_start);
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
if (loc) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
if (is_start) {
where = loc->start();
} else {
where = loc->end();
}
NO-OP whitespace (updated GH PR #357)
2017-07-01 12:42:24 -04:00
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use selected marker @ %1\n", where));
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
break;
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
NO-OP: fix some Wimplicit-fallthrough, see prev commit
2019-09-18 11:27:56 -04:00
/* fallthrough */
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
default:
case EditAtMouse:
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (!mouse_sample (where, ignored)) {
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
/* XXX not right but what can we do ? */
return 0;
}
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
snap_mf.sample = where;
rework snap snap now fills in a struct (MusicFrame) which contins a snapped frame along with a music divisor. this gives useful information wrt magnetic snap which may or may not have rounded to an exact musical position. region position may now be set musically (using quarter notes for now). this patch fixes several problems in the current code: - dragging a list of music-locked regions now maintains correct musical offsets within the list. - splitting regions using magnetic snap works correctly (#7192) - cut drag should now work correctly with magnetic snap. - musical length of split midi regions is no longer frame based.
2017-01-26 08:41:17 -05:00
snap_to (snap_mf);
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
where = snap_mf.sample;
NO-OP whitespace (updated GH PR #357)
2017-07-01 12:42:24 -04:00
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use mouse @ %1\n", where));
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
break;
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
}
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
return where;
merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles, start up, and creates a new session) git-svn-id: svn://localhost/ardour2/trunk@2606 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-07 20:40:25 -05:00
}
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::set_loop_range (samplepos_t start, samplepos_t end, string cmd)
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (!_session) return;
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
begin_reversible_command (cmd);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
Location* tll;
if ((tll = transport_loop_location()) == 0) {
allow all types of range location (loop, start, end etc.) to be glued to bars and beats.
2016-12-28 09:39:31 -05:00
Location* loc = new Location (*_session, start, end, _("Loop"), Location::IsAutoLoop, get_grid_music_divisions(0));
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
XMLNode &before = _session->locations()->get_state();
_session->locations()->add (loc, true);
_session->set_auto_loop_location (loc);
XMLNode &after = _session->locations()->get_state();
_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
} else {
Fix indentation. git-svn-id: svn://localhost/ardour2/branches/3.0@5050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 21:24:44 -04:00
XMLNode &before = tll->get_state();
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
tll->set_hidden (false, this);
tll->set (start, end);
Fix indentation. git-svn-id: svn://localhost/ardour2/branches/3.0@5050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 21:24:44 -04:00
XMLNode &after = tll->get_state();
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_session->add_command (new MementoCommand<Location>(*tll, &before, &after));
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
commit_reversible_command ();
}
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::set_punch_range (samplepos_t start, samplepos_t end, string cmd)
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
{
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (!_session) return;
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
begin_reversible_command (cmd);
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
Location* tpl;
if ((tpl = transport_punch_location()) == 0) {
allow all types of range location (loop, start, end etc.) to be glued to bars and beats.
2016-12-28 09:39:31 -05:00
Location* loc = new Location (*_session, start, end, _("Punch"), Location::IsAutoPunch, get_grid_music_divisions(0));
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
XMLNode &before = _session->locations()->get_state();
_session->locations()->add (loc, true);
various work to make loop/punch display work better (including fixes for bugs present in master also)
2014-01-27 21:27:13 -05:00
_session->set_auto_punch_location (loc);
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
XMLNode &after = _session->locations()->get_state();
_session->add_command (new MementoCommand<Locations>(*(_session->locations()), &before, &after));
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
} else {
Fix indentation. git-svn-id: svn://localhost/ardour2/branches/3.0@5050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 21:24:44 -04:00
XMLNode &before = tpl->get_state();
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
tpl->set_hidden (false, this);
tpl->set (start, end);
Fix indentation. git-svn-id: svn://localhost/ardour2/branches/3.0@5050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-04 21:24:44 -04:00
XMLNode &after = tpl->get_state();
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_session->add_command (new MementoCommand<Location>(*tpl, &before, &after));
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merge from 2.0-ongoing by hand, minus key binding editor git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-10-11 18:07:47 -04:00
commit_reversible_command ();
}
Clean up range menu a bit. Make a couple of range actions happen to all tracks if no tracks nor regions are selected. Stop involvement of the edit point in those same actions as it doesn't seem to make much sense. git-svn-id: svn://localhost/ardour2/branches/3.0@5407 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 15:55:12 -04:00
/** Find regions which exist at a given time, and optionally on a given list of tracks.
* @param rs List to which found regions are added.
* @param where Time to look at.
* @param ts Tracks to look on; if this is empty, all tracks are examined.
*/
Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 17:43:18 -05:00
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::get_regions_at (RegionSelection& rs, samplepos_t where, const TrackViewList& ts) const
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
{
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
const TrackViewList* tracks;
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
if (ts.empty()) {
tracks = &track_views;
} else {
tracks = &ts;
}
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
Patch from Lincoln to fix rhythm ferret in various ways (#3715). git-svn-id: svn://localhost/ardour2/branches/3.0@8542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 13:35:11 -05:00
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
Patch from Lincoln to fix rhythm ferret in various ways (#3715). git-svn-id: svn://localhost/ardour2/branches/3.0@8542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 13:35:11 -05:00
Fix a bunch of the ol' trivial audio-specific-for-no-particular-reason things. Re-addition of this sort of thing is now officially punishable by death ;) git-svn-id: svn://localhost/ardour2/branches/3.0@4603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 02:04:27 -05:00
if (rtv) {
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
boost::shared_ptr<Track> tr;
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
boost::shared_ptr<Playlist> pl;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
no more per-track varispeed
2017-04-17 06:12:49 -04:00
boost::shared_ptr<RegionList> regions = pl->regions_at (where);
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead. git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 11:29:01 -05:00
for (RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
Fix a bunch of the ol' trivial audio-specific-for-no-particular-reason things. Re-addition of this sort of thing is now officially punishable by death ;) git-svn-id: svn://localhost/ardour2/branches/3.0@4603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 02:04:27 -05:00
RegionView* rv = rtv->view()->find_view (*i);
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
if (rv) {
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
rs.add (rv);
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
}
}
}
}
}
}
Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 17:43:18 -05:00
void
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::get_regions_after (RegionSelection& rs, samplepos_t where, const TrackViewList& ts) const
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
{
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
const TrackViewList* tracks;
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
if (ts.empty()) {
tracks = &track_views;
} else {
tracks = &ts;
}
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
for (TrackViewList::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t);
Fix a bunch of the ol' trivial audio-specific-for-no-particular-reason things. Re-addition of this sort of thing is now officially punishable by death ;) git-svn-id: svn://localhost/ardour2/branches/3.0@4603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 02:04:27 -05:00
if (rtv) {
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
boost::shared_ptr<Track> tr;
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
boost::shared_ptr<Playlist> pl;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
if ((tr = rtv->track()) && ((pl = tr->playlist()))) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
boost::shared_ptr<RegionList> regions = pl->regions_touched (where, max_samplepos);
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
promote Playlist::RegionList to ARDOUR::RegionList; fix timefx on multiple regions, even regions of mixed type. this mostly involved some trivial code changes but to make the code simpler and less error prone, the API switched away from using RegionSelection (list of regionviews that catches regionviews vanishing) and used RegionList (lists of regions, no semantics) instead. git-svn-id: svn://localhost/ardour2/branches/3.0@11362 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 11:29:01 -05:00
for (RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
Fix a bunch of the ol' trivial audio-specific-for-no-particular-reason things. Re-addition of this sort of thing is now officially punishable by death ;) git-svn-id: svn://localhost/ardour2/branches/3.0@4603 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 02:04:27 -05:00
RegionView* rv = rtv->view()->find_view (*i);
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
if (rv) {
fix get_regions_after() -- used by videotimeline
2013-03-12 16:42:51 -04:00
rs.add (rv);
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
}
}
}
}
}
}
Another stab at the logic for selecting regions for operations, to ensure that edit groups are taken into account at all times. git-svn-id: svn://localhost/ardour2/branches/3.0@8379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 21:21:12 -05:00
/** Get regions using the following method:
Modify get_regions_for_action to fix #2960. Rationale is in the comment for that method. This method is used a lot, so this commit may have unwanted side-effects. git-svn-id: svn://localhost/ardour2/branches/3.0@7908 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-19 18:08:39 -04:00
*
new approach to selections which will help rationalize Split and similar functions. Object and Track selections are now mutually exclusive. a split will happen at (a) selection->regions (b) the intersection of edit_point and selection->tracks or (c) the region under the mouse, IFF nothing else is selected.
2014-07-05 21:47:43 -04:00
* Make a region list using:
* (a) any selected regions
* (b) the intersection of any selected tracks and the edit point(*)
* (c) if neither exists, and edit_point == mouse, then whatever region is under the mouse
Another stab at the logic for selecting regions for operations, to ensure that edit groups are taken into account at all times. git-svn-id: svn://localhost/ardour2/branches/3.0@8379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 21:21:12 -05:00
*
new approach to selections which will help rationalize Split and similar functions. Object and Track selections are now mutually exclusive. a split will happen at (a) selection->regions (b) the intersection of edit_point and selection->tracks or (c) the region under the mouse, IFF nothing else is selected.
2014-07-05 21:47:43 -04:00
* (*) NOTE: in this case, if 'No Selection = All Tracks' is active, search all tracks
Another stab at the logic for selecting regions for operations, to ensure that edit groups are taken into account at all times. git-svn-id: svn://localhost/ardour2/branches/3.0@8379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 21:21:12 -05:00
*
new approach to selections which will help rationalize Split and similar functions. Object and Track selections are now mutually exclusive. a split will happen at (a) selection->regions (b) the intersection of edit_point and selection->tracks or (c) the region under the mouse, IFF nothing else is selected.
2014-07-05 21:47:43 -04:00
* Note that we have forced the rule that selected regions and selected tracks are mutually exclusive
Clean up range menu a bit. Make a couple of range actions happen to all tracks if no tracks nor regions are selected. Stop involvement of the edit point in those same actions as it doesn't seem to make much sense. git-svn-id: svn://localhost/ardour2/branches/3.0@5407 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-21 15:55:12 -04:00
*/
Clean up get_regions_for_action prototype slightly. git-svn-id: svn://localhost/ardour2/branches/3.0@7909 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-19 20:19:09 -04:00
RegionSelection
tentative steps in trying to fix region action sensitivity
2017-02-10 16:12:28 -05:00
Editor::get_regions_from_selection_and_edit_point (EditIgnoreOption ignore, bool from_context_menu, bool from_outside_canvas)
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
{
Another stab at the logic for selecting regions for operations, to ensure that edit groups are taken into account at all times. git-svn-id: svn://localhost/ardour2/branches/3.0@8379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 21:21:12 -05:00
RegionSelection regions;
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (_edit_point == EditAtMouse && entered_regionview && selection->tracks.empty() && selection->regions.empty()) {
Another stab at the logic for selecting regions for operations, to ensure that edit groups are taken into account at all times. git-svn-id: svn://localhost/ardour2/branches/3.0@8379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 21:21:12 -05:00
regions.add (entered_regionview);
revert part of 0f1c7b1d7107 which broke lots of stuff based on region selection
2014-07-03 15:48:20 -04:00
} else {
regions = selection->regions;
Modify get_regions_for_action to fix #2960. Rationale is in the comment for that method. This method is used a lot, so this commit may have unwanted side-effects. git-svn-id: svn://localhost/ardour2/branches/3.0@7908 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-10-19 18:08:39 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (regions.empty()) {
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
TrackViewList tracks = selection->tracks;
Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 17:43:18 -05:00
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
if (!tracks.empty()) {
/* no region selected or entered, but some selected tracks:
* act on all regions on the selected tracks at the edit point
globally remove all trailing whitespace from ardour code base. Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
*/
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t const where = get_preferred_edit_position (ignore, from_context_menu, from_outside_canvas);
some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions
2014-07-07 10:13:19 -04:00
get_regions_at(regions, where, tracks);
}
}
return regions;
}
/** Get regions using the following method:
*
* Make a region list using:
* (a) any selected regions
* (b) the intersection of any selected tracks and the edit point(*)
* (c) if neither exists, then whatever region is under the mouse
*
* (*) NOTE: in this case, if 'No Selection = All Tracks' is active, search all tracks
*
* Note that we have forced the rule that selected regions and selected tracks are mutually exclusive
*/
RegionSelection
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
Editor::get_regions_from_selection_and_mouse (samplepos_t pos)
some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions
2014-07-07 10:13:19 -04:00
{
RegionSelection regions;
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (entered_regionview && selection->tracks.empty() && selection->regions.empty()) {
some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions
2014-07-07 10:13:19 -04:00
regions.add (entered_regionview);
} else {
regions = selection->regions;
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (regions.empty()) {
some code shuffling to make sure that cut mode always operates at the mouse location, with (maybe) the right regions
2014-07-07 10:13:19 -04:00
TrackViewList tracks = selection->tracks;
if (!tracks.empty()) {
/* no region selected or entered, but some selected tracks:
* act on all regions on the selected tracks at the edit point
globally remove all trailing whitespace from ardour code base. Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
*/
fix build after copy-n-paste/code change collision
2014-07-07 10:21:47 -04:00
get_regions_at(regions, pos, tracks);
Patch from colinf to avoid splitting unselected regions on the same track as a selected region; also make no selection = all tracks button work (#4831). git-svn-id: svn://localhost/ardour2/branches/3.0@12459 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-27 15:36:27 -04:00
}
Merge with 2.0-ongoing R3071. git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-16 17:43:18 -05:00
}
new approach to selections which will help rationalize Split and similar functions. Object and Track selections are now mutually exclusive. a split will happen at (a) selection->regions (b) the intersection of edit_point and selection->tracks or (c) the region under the mouse, IFF nothing else is selected.
2014-07-05 21:47:43 -04:00
Another stab at the logic for selecting regions for operations, to ensure that edit groups are taken into account at all times. git-svn-id: svn://localhost/ardour2/branches/3.0@8379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 21:21:12 -05:00
return regions;
merged with trunk revs 2605-2627 git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-11-12 17:23:01 -05:00
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
Patch from Lincoln to fix rhythm ferret in various ways (#3715). git-svn-id: svn://localhost/ardour2/branches/3.0@8542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 13:35:11 -05:00
/** Start with regions that are selected, or the entered regionview if none are selected.
* Then add equivalent regions on tracks in the same active edit-enabled route group as any
* of the regions that we started with.
*/
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
RegionSelection
change const some functions to const. (prepare lua bindings)
2016-04-08 18:33:03 -04:00
Editor::get_regions_from_selection_and_entered () const
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
{
Patch from Lincoln to fix rhythm ferret in various ways (#3715). git-svn-id: svn://localhost/ardour2/branches/3.0@8542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 13:35:11 -05:00
RegionSelection regions = selection->regions;
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Patch from Lincoln to fix rhythm ferret in various ways (#3715). git-svn-id: svn://localhost/ardour2/branches/3.0@8542 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-19 13:35:11 -05:00
if (regions.empty() && entered_regionview) {
regions.add (entered_regionview);
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
}
master merge; new files not added after initial cairocanvas patch application
2013-04-05 17:16:33 -04:00
return regions;
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
}
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
void
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
Editor::get_regionviews_by_id (PBD::ID const id, RegionSelection & regions) const
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
{
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
RouteTimeAxisView* rtav;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
if ((rtav = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
boost::shared_ptr<Playlist> pl;
std::vector<boost::shared_ptr<Region> > results;
boost::shared_ptr<Track> tr;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
if ((tr = rtav->track()) == 0) {
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
/* bus */
continue;
}
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
if ((pl = (tr->playlist())) != 0) {
boost::shared_ptr<Region> r = pl->region_by_id (id);
if (r) {
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
RegionView* rv = rtav->view()->find_view (r);
if (rv) {
regions.push_back (rv);
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
}
}
}
}
}
}
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
void
convert codebase to use Temporal for various time types
2017-09-24 12:03:54 -04:00
Editor::get_per_region_note_selection (list<pair<PBD::ID, set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > > &selection) const
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
{
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
MidiTimeAxisView* mtav;
clean up whitespace & debug output in 44203ce
2015-01-10 20:55:48 -05:00
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
if ((mtav = dynamic_cast<MidiTimeAxisView*> (*i)) != 0) {
mtav->get_per_region_note_selection (selection);
}
}
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
void
allow region list selection of whole file regions to select every instance of a region that has any source relationship with that whole file region (from a logic feature that came up while writing the manual) git-svn-id: svn://localhost/ardour2/branches/3.0@13779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 17:46:51 -05:00
Editor::get_regions_corresponding_to (boost::shared_ptr<Region> region, vector<RegionView*>& regions, bool src_comparison)
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
{
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
RouteTimeAxisView* tatv;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
boost::shared_ptr<Playlist> pl;
vector<boost::shared_ptr<Region> > results;
RegionView* marv;
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
boost::shared_ptr<Track> tr;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
if ((tr = tatv->track()) == 0) {
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
/* bus */
continue;
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again. git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-21 16:42:22 -04:00
if ((pl = (tr->playlist())) != 0) {
allow region list selection of whole file regions to select every instance of a region that has any source relationship with that whole file region (from a logic feature that came up while writing the manual) git-svn-id: svn://localhost/ardour2/branches/3.0@13779 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-01-04 17:46:51 -05:00
if (src_comparison) {
pl->get_source_equivalent_regions (region, results);
} else {
pl->get_region_list_equivalent_regions (region, results);
}
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
for (vector<boost::shared_ptr<Region> >::iterator ir = results.begin(); ir != results.end(); ++ir) {
if ((marv = tatv->view()->find_view (*ir)) != 0) {
regions.push_back (marv);
}
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837. git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-01-10 16:20:59 -05:00
}
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
}
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
Lua bindings to access editor selection + region selection bindings
2017-02-23 16:31:03 -05:00
RegionView*
Add some convenient public editor methods (for lua-bindings) and s/get// in the old API for consistency.
2017-02-24 07:03:24 -05:00
Editor::regionview_from_region (boost::shared_ptr<Region> region) const
Lua bindings to access editor selection + region selection bindings
2017-02-23 16:31:03 -05:00
{
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
RouteTimeAxisView* tatv;
if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
if (!tatv->track()) {
continue;
}
RegionView* marv = tatv->view()->find_view (region);
if (marv) {
return marv;
}
}
}
return NULL;
}
Add some convenient public editor methods (for lua-bindings) and s/get// in the old API for consistency.
2017-02-24 07:03:24 -05:00
RouteTimeAxisView*
Editor::rtav_from_route (boost::shared_ptr<Route> route) const
{
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
RouteTimeAxisView* rtav;
if ((rtav = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
if (rtav->route() == route) {
return rtav;
}
}
}
return NULL;
}
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
void
Editor::show_rhythm_ferret ()
{
if (rhythm_ferret == 0) {
rhythm_ferret = new RhythmFerret(*this);
}
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
rhythm_ferret->set_session (_session);
Merge with trunk R2978. git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-02-01 22:57:35 -05:00
rhythm_ferret->show ();
rhythm_ferret->present ();
}
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
void
Editor::first_idle ()
{
Replace some Gtk:MessageDialog with Ardour's variant This fixes some issues with stuck splash screen early on.
2020-01-15 16:01:30 -05:00
ArdourMessageDialog* dialog = 0;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
if (track_views.size() > 1) {
suspend timers while flushing the gtk-event queue. This fixes an issues where Ardour never completes to flush the GUI event queue due to rapid updates for meters and similar events. ARDOUR_UI::load_session() never returned and the complete session ran inside Gtkmm2ext::UI::flush_pending(), this later causes a crash at exit. as side effect, this also speeds up session load.
2015-10-30 10:54:54 -04:00
Timers::TimerSuspender t;
Replace some Gtk:MessageDialog with Ardour's variant This fixes some issues with stuck splash screen early on.
2020-01-15 16:01:30 -05:00
dialog = new ArdourMessageDialog (
Repair thinko in previous commit. git-svn-id: svn://localhost/ardour2/branches/3.0@10612 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 08:30:55 -05:00
string_compose (_("Please wait while %1 loads visual data."), PROGRAM_NAME),
true
Tidy a couple of minor things up. git-svn-id: svn://localhost/ardour2/branches/3.0@10607 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-14 21:06:09 -05:00
);
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
dialog->present ();
add some flush_pending timeouts
2016-07-25 08:51:23 -04:00
ARDOUR_UI::instance()->flush_pending (60);
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
}
for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) {
(*t)->first_idle();
}
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-12-12 09:43:24 -05:00
don't set region selection on loading a session 1 by 1, but just once after they should all exist
2017-04-01 11:14:06 -04:00
/* now that all regionviews should exist, setup region selection */
RegionSelection rs;
for (list<PBD::ID>::iterator pr = selection->regions.pending.begin (); pr != selection->regions.pending.end (); ++pr) {
/* this is cumulative: rs is NOT cleared each time */
get_regionviews_by_id (*pr, rs);
}
selection->set (rs);
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* first idle adds route children (automation tracks), so we need to redisplay here */
Split route group list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 14:37:15 -04:00
_routes->redisplay ();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Repair thinko in previous commit. git-svn-id: svn://localhost/ardour2/branches/3.0@10612 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 08:30:55 -05:00
delete dialog;
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
Make editor undo/redo actions sensitive at appropriate times.
2014-12-22 12:52:29 -05:00
if (_session->undo_depth() == 0) {
undo_action->set_sensitive(false);
}
redo_action->set_sensitive(false);
Separate selection operations into their own temporary history mechanism. The user can now replay *all* earlier selection operations until the next session undo/redo command, or the completion of a new operation. Nothing relating to selection ops is stored, and selection operation history is begun on first idle. Selection operation history is fundamentally different from the history of operations which act on a selection in terms of both their viewport and the amount of information required to replay them. WRT undo, the user of a selection op doesn't care about the viewport state at the beginning of an op, but rather that at the end of the previous one.
2014-12-22 08:30:23 -05:00
begin_selection_op_history ();
merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-03-17 16:54:03 -04:00
_have_idled = true;
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
save tearoff state; restore monitor section state reasonably well; fixup access control to parts of editor.h (needs more work); extend CrossThread just a little git-svn-id: svn://localhost/ardour2/branches/3.0@6774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-18 22:49:01 -04:00
gboolean
Editor::_idle_resize (gpointer arg)
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
{
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
return ((Editor*)arg)->idle_resize ();
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::add_to_idle_resize (TimeAxisView* view, int32_t h)
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
{
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
if (resize_idle_id < 0) {
fix track height resizing on OSX. If the transport is running, g_idle with G_PRIORITY_DEFAULT_IDLE is never called. TODO: check other g_idle functions in libs/gtkmm2ext
2014-10-21 07:20:17 -04:00
/* https://developer.gnome.org/glib/stable/glib-The-Main-Event-Loop.html#G-PRIORITY-HIGH-IDLE:CAPS
* GTK+ uses G_PRIORITY_HIGH_IDLE + 10 for resizing operations, and G_PRIORITY_HIGH_IDLE + 20 for redrawing operations.
* (This is done to ensure that any pending resizes are processed before any pending redraws, so that widgets are not redrawn twice unnecessarily.)
*/
resize_idle_id = g_idle_add_full (G_PRIORITY_HIGH_IDLE + 10, _idle_resize, this, NULL);
Reduce complexity of previous commit slightly. git-svn-id: svn://localhost/ardour2/branches/3.0@5215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:43:27 -04:00
_pending_resize_amount = 0;
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
/* make a note of the smallest resulting height, so that we can clamp the
lower limit at TimeAxisView::hSmall */
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
int32_t min_resulting = INT32_MAX;
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
Reduce complexity of previous commit slightly. git-svn-id: svn://localhost/ardour2/branches/3.0@5215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:43:27 -04:00
_pending_resize_amount += h;
_pending_resize_view = view;
min_resulting = min (min_resulting, int32_t (_pending_resize_view->current_height()) + _pending_resize_amount);
Only resize other selected tracks if the one being dragged is selected. git-svn-id: svn://localhost/ardour2/branches/3.0@5281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-26 10:06:49 -04:00
if (selection->tracks.contains (_pending_resize_view)) {
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
for (TrackViewList::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
Only resize other selected tracks if the one being dragged is selected. git-svn-id: svn://localhost/ardour2/branches/3.0@5281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-26 10:06:49 -04:00
min_resulting = min (min_resulting, int32_t ((*i)->current_height()) + _pending_resize_amount);
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
if (min_resulting < 0) {
min_resulting = 0;
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
/* clamp */
Fix track height menu. git-svn-id: svn://localhost/ardour2/branches/3.0@7093 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-10 20:09:41 -04:00
if (uint32_t (min_resulting) < TimeAxisView::preset_height (HeightSmall)) {
_pending_resize_amount += TimeAxisView::preset_height (HeightSmall) - min_resulting;
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
}
Remove unused resize-line code. When resizing multiple tracks, resize them in proportion, as per mantis 2732. git-svn-id: svn://localhost/ardour2/branches/3.0@5213 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:08:51 -04:00
/** Handle pending resizing of tracks */
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
bool
Editor::idle_resize ()
{
Reduce complexity of previous commit slightly. git-svn-id: svn://localhost/ardour2/branches/3.0@5215 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-17 18:43:27 -04:00
_pending_resize_view->idle_resize (_pending_resize_view->current_height() + _pending_resize_amount);
Don't resize selected tracks when dragging an automation view. git-svn-id: svn://localhost/ardour2/branches/3.0@5277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-26 08:18:57 -04:00
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
if (dynamic_cast<AutomationTimeAxisView*> (_pending_resize_view) == 0 &&
Only resize other selected tracks if the one being dragged is selected. git-svn-id: svn://localhost/ardour2/branches/3.0@5281 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-26 10:06:49 -04:00
selection->tracks.contains (_pending_resize_view)) {
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
for (TrackViewList::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
Don't resize selected tracks when dragging an automation view. git-svn-id: svn://localhost/ardour2/branches/3.0@5277 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-26 08:18:57 -04:00
if (*i != _pending_resize_view) {
(*i)->idle_resize ((*i)->current_height() + _pending_resize_amount);
}
}
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
_pending_resize_amount = 0;
Make sure group tabs are updated when dragging track heights. git-svn-id: svn://localhost/ardour2/branches/3.0@5264 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-23 18:13:05 -04:00
_group_tabs->set_dirty ();
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
resize_idle_id = -1;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
merge from 2.0-ongoing @ 3581 git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-10 11:03:30 -04:00
return false;
}
Fix for visual glitch due to race between Editor::update_current_screen being called and a locate event being processed. git-svn-id: svn://localhost/ardour2/branches/3.0@4608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 19:12:22 -05:00
void
Editor::located ()
{
Clean up the idle_visual_changer a bit, fixing a bug where the playhead would jump around when zooming a lot with playhead zoom focus. git-svn-id: svn://localhost/ardour2/branches/3.0@6462 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-01-05 20:37:38 -05:00
ENSURE_GUI_THREAD (*this, &Editor::located);
Fix for visual glitch due to race between Editor::update_current_screen being called and a locate event being processed. git-svn-id: svn://localhost/ardour2/branches/3.0@4608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 19:12:22 -05:00
break out of step editing if a session goes away; do nothing in Editor::located() if the session has gone away git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 11:19:58 -04:00
if (_session) {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
playhead_cursor->set_position (_session->audible_sample ());
break out of step editing if a session goes away; do nothing in Editor::located() if the session has gone away git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 11:19:58 -04:00
if (_follow_playhead && !_pending_initial_locate) {
reset_x_origin_to_follow_playhead ();
}
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
}
Fix for visual glitch due to race between Editor::update_current_screen being called and a locate event being processed. git-svn-id: svn://localhost/ardour2/branches/3.0@4608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 19:12:22 -05:00
_pending_locate_request = false;
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
_pending_initial_locate = false;
Reset Playhead interpolation when looping and locating
2017-03-31 08:11:49 -04:00
_last_update_time = 0;
Fix for visual glitch due to race between Editor::update_current_screen being called and a locate event being processed. git-svn-id: svn://localhost/ardour2/branches/3.0@4608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-16 19:12:22 -05:00
}
Add a widget giving an overview of the editor, as (what I think is being) suggested in #2714. Many caveats: most notably that it looks quite ugly and you can't (yet) turn it off. git-svn-id: svn://localhost/ardour2/branches/3.0@5162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-10 21:05:01 -04:00
void
Add editor selection state to session history via a SelectionMemento, which combines selection related editor properties with the current editor selection. The related editor properties are: mouse mode, zoom setting, left frame of the canvas, y origin of the canvas. Selection state now includes region views (storing the underlying region id) and time. This patch also fixes a region mute undo bug.
2014-12-14 08:13:38 -05:00
Editor::region_view_added (RegionView * rv)
Add a widget giving an overview of the editor, as (what I think is being) suggested in #2714. Many caveats: most notably that it looks quite ugly and you can't (yet) turn it off. git-svn-id: svn://localhost/ardour2/branches/3.0@5162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-10 21:05:01 -04:00
{
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rv);
if (mrv) {
Note selection state uses note event_id_t.
2016-10-15 08:50:02 -04:00
list<pair<PBD::ID const, list<Evoral::event_id_t> > >::iterator rnote;
Fix AutomationTrackItem rubberband click thinking it was unhandled. Fix several other cases where a single mouse click could cause several (not nested) selection ops. Fix missing selection memento for midi notes and midi commands. Rename some variables. Fix random style issues.
2015-01-10 12:07:31 -05:00
for (rnote = selection->pending_midi_note_selection.begin(); rnote != selection->pending_midi_note_selection.end(); ++rnote) {
if (rv->region()->id () == (*rnote).first) {
mrv->select_notes ((*rnote).second);
selection->pending_midi_note_selection.erase(rnote);
break;
}
}
}
Render tracks and regions to a background image in the editor summary. Connect to editor's SelectionChanged signal to display corresponding region colour change.
2014-06-17 07:44:36 -04:00
_summary->set_background_dirty ();
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
mark_region_boundary_cache_dirty ();
Add a widget giving an overview of the editor, as (what I think is being) suggested in #2714. Many caveats: most notably that it looks quite ugly and you can't (yet) turn it off. git-svn-id: svn://localhost/ardour2/branches/3.0@5162 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-10 21:05:01 -04:00
}
Various fixes and improvements to editor summary widget. git-svn-id: svn://localhost/ardour2/branches/3.0@5179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-13 13:52:51 -04:00
Update summary when a region is removed. git-svn-id: svn://localhost/ardour2/branches/3.0@8622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-30 08:24:41 -05:00
void
Editor::region_view_removed ()
{
Render tracks and regions to a background image in the editor summary. Connect to editor's SelectionChanged signal to display corresponding region colour change.
2014-06-17 07:44:36 -04:00
_summary->set_background_dirty ();
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
mark_region_boundary_cache_dirty ();
Update summary when a region is removed. git-svn-id: svn://localhost/ardour2/branches/3.0@8622 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-30 08:24:41 -05:00
}
use CoreSelection for track selection
2017-05-05 07:31:49 -04:00
AxisView*
Editor::axis_view_by_stripable (boost::shared_ptr<Stripable> s) const
Use track colours in the port matrix. git-svn-id: svn://localhost/ardour2/branches/3.0@5367 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-17 09:18:58 -04:00
{
many changes associated with rationalizing selection flow
2016-07-06 13:37:30 -04:00
for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) {
if ((*j)->stripable() == s) {
return *j;
Use track colours in the port matrix. git-svn-id: svn://localhost/ardour2/branches/3.0@5367 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-17 09:18:58 -04:00
}
}
return 0;
}
use CoreSelection for track selection
2017-05-05 07:31:49 -04:00
AxisView*
Editor::axis_view_by_control (boost::shared_ptr<AutomationControl> c) const
{
for (TrackViewList::const_iterator j = track_views.begin (); j != track_views.end(); ++j) {
if ((*j)->control() == c) {
return *j;
}
Editor::axis_view_by_control() needs to explore child tracks, now that Selection is relying on it
2017-05-05 13:06:51 -04:00
TimeAxisView::Children kids = (*j)->get_child_list ();
for (TimeAxisView::Children::iterator k = kids.begin(); k != kids.end(); ++k) {
if ((*k)->control() == c) {
return (*k).get();
}
}
use CoreSelection for track selection
2017-05-05 07:31:49 -04:00
}
return 0;
}
Use track colours in the port matrix. git-svn-id: svn://localhost/ardour2/branches/3.0@5367 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-17 09:18:58 -04:00
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
TrackViewList
drastic, deep and wide changes to make RouteGroup use boost::shared_ptr<Route> and boost::shared_ptr<RouteList> to better fit into emerging framework for "RT operations" ; torben's changes to MTC slaving code (sorry for bundling) git-svn-id: svn://localhost/ardour2/branches/3.0@6334 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 22:25:32 -05:00
Editor::axis_views_from_routes (boost::shared_ptr<RouteList> r) const
Merge edit and mix groups to just being route groups. Add properties to route groups to decide what things their member routes will share. Allow edits to happen across a route group without its tracks necessarily being selected. git-svn-id: svn://localhost/ardour2/branches/3.0@5236 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-21 15:59:56 -04:00
{
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
TrackViewList t;
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
drastic, deep and wide changes to make RouteGroup use boost::shared_ptr<Route> and boost::shared_ptr<RouteList> to better fit into emerging framework for "RT operations" ; torben's changes to MTC slaving code (sorry for bundling) git-svn-id: svn://localhost/ardour2/branches/3.0@6334 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-09 22:25:32 -05:00
for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) {
use CoreSelection for track selection
2017-05-05 07:31:49 -04:00
TimeAxisView* tv = time_axis_view_from_stripable (*i);
Use track colours in the port matrix. git-svn-id: svn://localhost/ardour2/branches/3.0@5367 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-17 09:18:58 -04:00
if (tv) {
t.push_back (tv);
Merge edit and mix groups to just being route groups. Add properties to route groups to decide what things their member routes will share. Allow edits to happen across a route group without its tracks necessarily being selected. git-svn-id: svn://localhost/ardour2/branches/3.0@5236 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-21 15:59:56 -04:00
}
}
return t;
}
add RAII DisplaySuspender
2014-06-28 17:22:15 -04:00
void
Editor::suspend_route_redisplay ()
{
if (_routes) {
_routes->suspend_redisplay();
}
}
void
Editor::resume_route_redisplay ()
{
if (_routes) {
fix over-optimzation in e3375c3. Some users of DisplaySuspender expect an implicit redisplay.
2015-04-30 12:28:27 -04:00
_routes->redisplay(); // queue redisplay
add RAII DisplaySuspender
2014-06-28 17:22:15 -04:00
_routes->resume_redisplay();
}
}
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
void
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
Editor::add_vcas (VCAList& vlist)
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
{
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
StripableList sl;
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
for (VCAList::iterator v = vlist.begin(); v != vlist.end(); ++v) {
sl.push_back (boost::dynamic_pointer_cast<Stripable> (*v));
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
}
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
add_stripables (sl);
initial implementation of VCA time axis views
2016-05-21 16:36:08 -04:00
}
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
void
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
Editor::add_routes (RouteList& rlist)
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
{
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
StripableList sl;
for (RouteList::iterator r = rlist.begin(); r != rlist.end(); ++r) {
sl.push_back (*r);
}
add_stripables (sl);
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
void
Editor::add_stripables (StripableList& sl)
{
list<TimeAxisView*> new_views;
boost::shared_ptr<VCA> v;
boost::shared_ptr<Route> r;
Add new routes to selection in the editor, rather than the editor route list. Fixes new tracks not being selected. Also begin selection op history when adding routes.
2015-03-12 11:47:16 -04:00
TrackViewList new_selection;
bool from_scratch = (track_views.size() == 0);
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
Use Stripable::Sorter in GUI consistently.
2017-06-16 17:45:16 -04:00
sl.sort (Stripable::Sorter());
when adding a list of Stripables, sort them into PresentationInfo order first
2016-06-05 15:59:00 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
for (StripableList::iterator s = sl.begin(); s != sl.end(); ++s) {
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
Foldback bus should not appear in editor
2019-08-26 22:01:19 -04:00
if ((*s)->is_foldbackbus()) {
continue;
}
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
if ((v = boost::dynamic_pointer_cast<VCA> (*s)) != 0) {
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
VCATimeAxisView* vtv = new VCATimeAxisView (*this, _session, *_track_canvas);
vtv->set_vca (v);
new_views.push_back (vtv);
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
} else if ((r = boost::dynamic_pointer_cast<Route> (*s)) != 0) {
if (r->is_auditioner() || r->is_monitor()) {
continue;
}
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
RouteTimeAxisView* rtv;
DataType dt = r->input()->default_type();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
if (dt == ARDOUR::DataType::AUDIO) {
rtv = new AudioTimeAxisView (*this, _session, *_track_canvas);
rtv->set_route (r);
} else if (dt == ARDOUR::DataType::MIDI) {
rtv = new MidiTimeAxisView (*this, _session, *_track_canvas);
rtv->set_route (r);
} else {
throw unknown_type();
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
new_views.push_back (rtv);
track_views.push_back (rtv);
new_selection.push_back (rtv);
rtv->effective_gain_display ();
rtv->view()->RegionViewAdded.connect (sigc::mem_fun (*this, &Editor::region_view_added));
rtv->view()->RegionViewRemoved.connect (sigc::mem_fun (*this, &Editor::region_view_removed));
}
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
}
prevent 0-pointer dereference in editor_routes.cc - fixes #5794
2013-12-28 10:15:00 -05:00
if (new_views.size() > 0) {
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
_routes->time_axis_views_added (new_views);
//_summary->routes_added (new_selection); /* XXX requires RouteTimeAxisViewList */
prevent 0-pointer dereference in editor_routes.cc - fixes #5794
2013-12-28 10:15:00 -05:00
}
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
/* note: !new_selection.empty() means that we got some routes rather
* than just VCAs
*/
if (!from_scratch && !new_selection.empty()) {
make selection of tracks/busses after adding them slightly more efficient
2017-03-26 10:12:10 -04:00
selection->set (new_selection);
Add new routes to selection in the editor, rather than the editor route list. Fixes new tracks not being selected. Also begin selection op history when adding routes.
2015-03-12 11:47:16 -04:00
begin_selection_op_history();
}
move from PresentationInfo::global_order() to PresentationInfo::order, and fix up part of reordering behaviour Dragging tracks/busses in the editor *below* VCAs still does not work
2016-06-03 15:15:30 -04:00
if (show_editor_mixer_when_tracks_arrive && !new_selection.empty()) {
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
show_editor_mixer (true);
}
editor_list_button.set_sensitive (true);
}
void
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
Editor::timeaxisview_deleted (TimeAxisView *tv)
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
{
ensure that Editor::entered_track is reset during session deletion to avoid a crash when we explicitly unset it elsewhere
2014-06-30 12:31:01 -04:00
if (tv == entered_track) {
entered_track = 0;
}
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
if (_session && _session->deletion_in_progress()) {
/* the situation is under control */
Prevent a crash in the situation where: 1. session teardown starts 2. editor responds by removing and destroying all TimeAxisViews 3. session then asks all routes to drop refs 4. the editor is called by each route's drop refs handler to remove the associated TimeAxisView 5. that TimeAxisView has already been destroyed in (2) git-svn-id: svn://localhost/ardour2/branches/3.0@6392 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 19:33:03 -05:00
return;
}
Fix update of the editor mixer when its route is removed; this stops routes (and hence their JACK ports) hanging around after deletion in the UI. git-svn-id: svn://localhost/ardour2/branches/3.0@6049 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-09 18:43:13 -05:00
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
ENSURE_GUI_THREAD (*this, &Editor::timeaxisview_deleted, tv);
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
Fix crash when selected automation-lane is removed When a plugin is deleted, automation-lanes of the given plugin are removed, but previously a pointed to the deleted lane remained in the selection. This caused crashes later when the track selection is used. e.g. during sensitize_the_right_region_actions() Note that ~TimeAxisView() also emits CatchDeletion (this); however "this" fails to be dynamic_cast<AutomationTimeAxisView*> because that d'tor has already been completed.
2019-08-24 12:21:08 -04:00
if (dynamic_cast<AutomationTimeAxisView*> (tv)) {
selection->remove (tv);
return;
}
Reset entered_track if it is set to an automation child whose parent is deleted. Fixes #3389. git-svn-id: svn://localhost/ardour2/branches/3.0@7569 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-09 10:11:24 -04:00
RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*> (tv);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked) git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 15:21:43 -05:00
_routes->route_removed (tv);
Move get_child_list() into TimeAxisView. git-svn-id: svn://localhost/ardour2/branches/3.0@7574 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-09 13:27:56 -04:00
TimeAxisView::Children c = tv->get_child_list ();
for (TimeAxisView::Children::const_iterator i = c.begin(); i != c.end(); ++i) {
if (entered_track == i->get()) {
entered_track = 0;
Reset entered_track if it is set to an automation child whose parent is deleted. Fixes #3389. git-svn-id: svn://localhost/ardour2/branches/3.0@7569 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-09 10:11:24 -04:00
}
}
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
/* remove it from the list of track views */
TrackViewList::iterator i;
if ((i = find (track_views.begin(), track_views.end(), tv)) != track_views.end()) {
i = track_views.erase (i);
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
}
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Consolidate code, skip editor/mixer update check
2019-08-24 12:37:28 -04:00
/* Update the route that is shown in the editor-mixer. */
if (!rtav) {
return;
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
}
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
Consolidate code, skip editor/mixer update check
2019-08-24 12:37:28 -04:00
boost::shared_ptr<Route> route = rtav->route ();
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
if (current_mixer_strip && current_mixer_strip->route() == route) {
TimeAxisView* next_tv;
cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropReferences & Destroyed in libardour ; CatchDeletion in the GTK UI); clarify ownership of objects (session no longer pays attention to DropReferences for objects that it is considered to own, such as routes, sources, etc); fix up MIDI parsing and a couple of other places by correcting syntax for return of values from a boost::signals2::signal (possible danger elsewhere to be checked) git-svn-id: svn://localhost/ardour2/branches/3.0@6389 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-22 15:21:43 -05:00
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
if (track_views.empty()) {
next_tv = 0;
} else if (i == track_views.end()) {
next_tv = track_views.front();
} else {
next_tv = (*i);
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Fix editor-mixer update when deleting a Route before a VCA When deleting the last track before a VCA, on-delete the editor-mixer switches to display the next TAV. If that turns out to be a VCATAV, the editor-mixer will ignore it and keep displaying the deleted route, holding a shared pointer reference (ports won't be dropped, etc etc).
2017-01-13 02:43:18 -05:00
// skip VCAs (cannot be selected, n/a in editor-mixer)
if (dynamic_cast<VCATimeAxisView*> (next_tv)) {
/* VCAs are sorted last in line -- route_sorter.h, jump to top */
next_tv = track_views.front();
}
if (dynamic_cast<VCATimeAxisView*> (next_tv)) {
/* just in case: no master, only a VCA remains */
next_tv = 0;
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
if (next_tv) {
set_selected_mixer_strip (*next_tv);
} else {
/* make the editor mixer strip go away setting the
* button to inactive (which also unticks the menu option)
*/
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
ActionManager::get_all_actions() no longer includes <Actions> in the paths it returns, part 3 (GUI)
2019-03-20 14:15:47 -04:00
ActionManager::uncheck_toggleaction ("Editor/show-editor-mixer");
rationalize destruction pathway (some more); tidy-ify some ImageFrame code git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-25 16:06:52 -05:00
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
}
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
}
void
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
Editor::hide_track_in_display (TimeAxisView* tv, bool apply_to_selection)
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
{
Add some convenient public editor methods (for lua-bindings) and s/get// in the old API for consistency.
2017-02-24 07:03:24 -05:00
if (!tv) {
return;
}
Fix crash when hiding multiple tracks Editor::hide_track_in_display() -> EditorRoutes::hide_track_in_display() and ensuing calls to sync the treeview may modify the selection (de-select hidden tracks) and invalidate selection->tracks
2017-09-11 12:30:32 -04:00
DisplaySuspender ds;
PresentationInfo::ChangeSuspender cs;
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
if (apply_to_selection) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end();) {
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
TrackSelection::iterator j = i;
++j;
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
hide_track_in_display (*i, false);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
i = j;
}
} else {
RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
if (rtv && current_mixer_strip && (rtv->route() == current_mixer_strip->route())) {
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* this will hide the mixer strip */
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
set_selected_mixer_strip (*tv);
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Hide/Remove to apply to the track selection. git-svn-id: svn://localhost/ardour2/branches/3.0@9090 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-07 08:05:45 -05:00
_routes->hide_track_in_display (*tv);
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
}
}
Add some convenient public editor methods (for lua-bindings) and s/get// in the old API for consistency.
2017-02-24 07:03:24 -05:00
void
Editor::show_track_in_display (TimeAxisView* tv, bool move_into_view)
{
if (!tv) {
return;
}
_routes->show_track_in_display (*tv);
if (move_into_view) {
ensure_time_axis_view_is_visible (*tv, false);
}
}
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
bool
Split route group list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 14:37:15 -04:00
Editor::sync_track_view_list_and_routes ()
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
{
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
track_views = TrackViewList (_routes->views ());
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
update summary when re-ordering tracks - fixes #6502
2015-08-08 09:58:44 -04:00
_summary->set_background_dirty();
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
_group_tabs->set_dirty ();
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only. Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 12:10:01 -04:00
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
return false; // do not call again (until needed)
}
void
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
Editor::foreach_time_axis_view (sigc::slot<void,TimeAxisView&> theslot)
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
{
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
theslot (**i);
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
}
}
Update Selection API to include all Stripables
2017-08-06 16:16:36 -04:00
/** Find a StripableTimeAxisView by the ID of its stripable */
StripableTimeAxisView*
Editor::get_stripable_time_axis_by_id (const PBD::ID& id) const
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
{
Update Selection API to include all Stripables
2017-08-06 16:16:36 -04:00
StripableTimeAxisView* v;
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
First go at saving window visibility and position state across saves. git-svn-id: svn://localhost/ardour2/branches/3.0@7644 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-17 22:20:15 -04:00
for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) {
Update Selection API to include all Stripables
2017-08-06 16:16:36 -04:00
if((v = dynamic_cast<StripableTimeAxisView*>(*i)) != 0) {
if(v->stripable()->id() == id) {
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
return v;
}
}
}
Back out big shared_ptr change. Moving to a branch. Apologies all. git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-09 13:58:13 -04:00
return 0;
Separate route list code from Editor into its own object, EditorRouteList. Hopefully makes things a bit better. git-svn-id: svn://localhost/ardour2/branches/3.0@5302 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-01 19:20:18 -04:00
}
Split route group list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 14:37:15 -04:00
void
Editor::fit_route_group (RouteGroup *g)
{
Apply Select property of route groups at the Selection object level. Accordingly simplify code related to selecting tracks. Add a TrackViewList object rather than "abusing" TrackSelection in lots of places. git-svn-id: svn://localhost/ardour2/branches/3.0@6358 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-13 14:09:52 -05:00
TrackViewList ts = axis_views_from_routes (g->route_list ());
Split route group list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5308 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 14:37:15 -04:00
fit_tracks (ts);
}
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
void
Editor::consider_auditioning (boost::shared_ptr<Region> region)
{
boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region);
if (r == 0) {
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_session->cancel_audition ();
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
return;
}
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
if (_session->is_auditioning()) {
_session->cancel_audition ();
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
if (r == last_audition_region) {
return;
}
}
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 13:24:23 -05:00
_session->audition_region (r);
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
last_audition_region = r;
}
void
Editor::hide_a_region (boost::shared_ptr<Region> r)
{
r->set_hidden (true);
}
void
Take away the Remove option from the region list, and add Show to re-show hidden regions. git-svn-id: svn://localhost/ardour2/branches/3.0@6814 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 21:11:48 -04:00
Editor::show_a_region (boost::shared_ptr<Region> r)
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
{
Take away the Remove option from the region list, and add Show to re-show hidden regions. git-svn-id: svn://localhost/ardour2/branches/3.0@6814 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 21:11:48 -04:00
r->set_hidden (false);
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
}
void
Editor::audition_region_from_region_list ()
{
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
_regions->selection_mapover (sigc::mem_fun (*this, &Editor::consider_auditioning));
Factor regions list out of Editor. git-svn-id: svn://localhost/ardour2/branches/3.0@5312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-07-03 18:42:22 -04:00
}
step editing now accessed via a context menu on MIDI track rec-enable buttons. along the way, fixed up confusion between set_rec_enable() and set_rec_enabled() methods in Route/Track/Diskstream git-svn-id: svn://localhost/ardour2/branches/3.0@7482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-24 12:40:56 -04:00
void
Editor::step_edit_status_change (bool yn)
{
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
if (yn) {
start_step_editing ();
} else {
stop_step_editing ();
}
step editing now accessed via a context menu on MIDI track rec-enable buttons. along the way, fixed up confusion between set_rec_enable() and set_rec_enabled() methods in Route/Track/Diskstream git-svn-id: svn://localhost/ardour2/branches/3.0@7482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-24 12:40:56 -04:00
}
just one timeout callback for step editing, not one per track git-svn-id: svn://localhost/ardour2/branches/3.0@5635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-09-05 10:11:48 -04:00
void
Editor::start_step_editing ()
{
make all use of bind/mem_fun be explicitly sigc:: git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 18:29:48 -05:00
step_edit_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &Editor::check_step_edit), 20);
just one timeout callback for step editing, not one per track git-svn-id: svn://localhost/ardour2/branches/3.0@5635 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-09-05 10:11:48 -04:00
}
void
Editor::stop_step_editing ()
{
step_edit_connection.disconnect ();
}
bool
Editor::check_step_edit ()
{
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*> (*i);
if (mtv) {
mtv->check_step_edit ();
}
}
return true; // do it again, till we stop
}
Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar. git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:10:06 -05:00
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
bool
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
Editor::scroll_press (Direction dir)
Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar. git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:10:06 -05:00
{
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
++_scroll_callbacks;
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
if (_scroll_connection.connected() && _scroll_callbacks < 5) {
/* delay the first auto-repeat */
return true;
}
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
switch (dir) {
case LEFT:
scroll_backward (1);
break;
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
case RIGHT:
scroll_forward (1);
break;
Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar. git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:10:06 -05:00
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
case UP:
up/down scroll buttons on left of summary should move by tracks
2014-07-14 12:35:44 -04:00
scroll_up_one_track ();
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
break;
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
case DOWN:
up/down scroll buttons on left of summary should move by tracks
2014-07-14 12:35:44 -04:00
scroll_down_one_track ();
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
break;
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
}
/* do hacky auto-repeat */
if (!_scroll_connection.connected ()) {
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
_scroll_connection = Glib::signal_timeout().connect (
sigc::bind (sigc::mem_fun (*this, &Editor::scroll_press), dir), 100
);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
_scroll_callbacks = 0;
}
return true;
}
void
Put some up/down buttons to the right of the summary. Might help with #3786. git-svn-id: svn://localhost/ardour2/branches/3.0@9021 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 19:30:19 -05:00
Editor::scroll_release ()
Make summary arrow buttons auto-repeat. git-svn-id: svn://localhost/ardour2/branches/3.0@7267 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-06-16 20:02:45 -04:00
{
_scroll_connection.disconnect ();
Remove unused editor hscroller code. Add buttons to the left and right of the summary to substitute for the equivalent buttons on a scrollbar. git-svn-id: svn://localhost/ardour2/branches/3.0@6239 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-11-30 23:10:06 -05:00
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
/** Queue a change for the Editor viewport x origin to follow the playhead */
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
void
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
Editor::reset_x_origin_to_follow_playhead ()
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
{
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t const sample = playhead_cursor->current_sample ();
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (sample < _leftmost_sample || sample > _leftmost_sample + current_page_samples()) {
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
if (_session->transport_speed() < 0) {
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (sample > (current_page_samples() / 2)) {
center_screen (sample-(current_page_samples()/2));
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
} else {
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
2013-04-12 11:21:12 -04:00
center_screen (current_page_samples()/2);
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
} else {
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t l = 0;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (sample < _leftmost_sample) {
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
/* moving left */
if (_session->transport_rolling()) {
/* rolling; end up with the playhead at the right of the page */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
l = sample - current_page_samples ();
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
} else {
Fix position of viewport after a playhead drag outside the viewport (when following the playhead). git-svn-id: svn://localhost/ardour2/branches/3.0@11399 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 14:24:26 -05:00
/* not rolling: end up with the playhead 1/4 of the way along the page */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
l = sample - current_page_samples() / 4;
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
}
} else {
/* moving right */
if (_session->transport_rolling()) {
/* rolling: end up with the playhead on the left of the page */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
l = sample;
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
} else {
Fix position of viewport after a playhead drag outside the viewport (when following the playhead). git-svn-id: svn://localhost/ardour2/branches/3.0@11399 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 14:24:26 -05:00
/* not rolling: end up with the playhead 3/4 of the way along the page */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
l = sample - 3 * current_page_samples() / 4;
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
}
}
Fix position of viewport after a playhead drag outside the viewport (when following the playhead). git-svn-id: svn://localhost/ardour2/branches/3.0@11399 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 14:24:26 -05:00
if (l < 0) {
l = 0;
}
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
leftmost_position => leftmost_sample, current_page_frames => current_page_samples
2013-04-12 11:21:12 -04:00
center_screen_internal (l + (current_page_samples() / 2), current_page_samples ());
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
}
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
}
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
void
Editor::super_rapid_screen_update ()
{
if (!_session || !_session->engine().running()) {
return;
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
/* METERING / MIXER STRIPS */
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
/* update track meters, if required */
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
if (contents().is_mapped() && meters_running) {
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
RouteTimeAxisView* rtv;
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
rtv->fast_update ();
}
}
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
/* and any current mixer strip */
if (current_mixer_strip) {
current_mixer_strip->fast_update ();
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Reset Playhead interpolation when looping and locating
2017-03-31 08:11:49 -04:00
bool latent_locate = false;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t sample = _session->audible_sample (&latent_locate);
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
const int64_t now = g_get_monotonic_time ();
double err = 0;
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Don't interpolate&smooth playhead pos during export.
2017-06-29 12:40:51 -04:00
if (_session->exporting ()) {
/* freewheel/export may be faster or slower than transport_speed() / SR.
* Also exporting multiple ranges locates/jumps without a _pending_locate_request.
*/
_last_update_time = 0;
}
Fix playhead smoothing when auditioning. Don't use timer to keep moving the playhead when auditioning. This fixes playhead jiggling during audition.
2018-11-10 21:38:34 -05:00
if (!_session->transport_rolling () || _session->is_auditioning ()) {
Fix/amend a23a8ebcad7. Updated condition to check for transport_rolling to include preroll and count-in (speed is != 0 during pre-roll and count-in, but transport is not actually rolling).
2018-02-24 06:55:48 -05:00
/* Do not interpolate the playhead position; just set it */
Do not interpolate playhead when stopped. This fixes a bug where, for a few seconds after transport stops, the users zoom+panning would get hijacked by the follow_playhead behavior, because the playhead was still "hunting".
2018-02-23 14:48:29 -05:00
_last_update_time = 0;
}
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
if (_last_update_time > 0) {
Don't interpolate&smooth playhead pos during export.
2017-06-29 12:40:51 -04:00
/* interpolate and smoothen playhead position */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
const double ds = (now - _last_update_time) * _session->transport_speed() * _session->nominal_sample_rate () * 1e-6;
samplepos_t guess = playhead_cursor->current_sample () + rint (ds);
err = sample - guess;
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
guess += err * .12 + _err_screen_engine; // time-constant based on 25fps (super_rapid_screen_update)
_err_screen_engine += .0144 * (err - _err_screen_engine); // tc^2
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
#if 0 // DEBUG
printf ("eng: %ld gui:%ld (%+6.1f) diff: %6.1f (err: %7.2f)\n",
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
sample, guess, ds,
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
err, _err_screen_engine);
#endif
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
sample = guess;
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
} else {
_err_screen_engine = 0;
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Reset Playhead interpolation when looping and locating
2017-03-31 08:11:49 -04:00
if (err > 8192 || latent_locate) {
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
// in case of x-runs or freewheeling
_last_update_time = 0;
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
sample = _session->audible_sample ();
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
} else {
_last_update_time = now;
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* snapped cursor stuff (the snapped_cursor shows where an operation is going to occur) */
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
bool ignored;
MusicSample where (sample, 0);
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
if (!UIConfiguration::instance().get_show_snapped_cursor()) {
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
snapped_cursor->hide ();
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
} else if (_edit_point == EditAtPlayhead && !_dragging_playhead) {
Reinstate the ability to split regions while dragging playhead. I think this was unintentionally lost.
2018-02-27 14:08:40 -05:00
/* EditAtPlayhead does not snap */
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
} else if (_edit_point == EditAtSelectedMarker) {
/* NOTE: I don't think EditAtSelectedMarker should snap. They are what they are.
* however, the current editing code -does- snap so I'll draw it that way for now.
*/
if (!selection->markers.empty()) {
Fix potential crash with EditAtSelectedMarker, when no marker is selected.
2018-02-09 14:43:20 -05:00
MusicSample ms (selection->markers.front()->position(), 0);
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
snap_to (ms); // should use snap_to_with_modifier?
snapped_cursor->set_position (ms.sample);
Fix potential crash with EditAtSelectedMarker, when no marker is selected.
2018-02-09 14:43:20 -05:00
snapped_cursor->show ();
}
Hide snap cursor when not using mouse edit #7966
2020-04-01 16:54:00 -04:00
} else if (_edit_point == EditAtMouse && mouse_sample (where.sample, ignored)) {
/* cursor is in the editing canvas. show it. */
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
snapped_cursor->show ();
Hide snap cursor when not using mouse edit #7966
2020-04-01 16:54:00 -04:00
} else {
/* mouse is out of the editing canvas, or edit-point isn't mouse. Hide the snapped_cursor */
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
snapped_cursor->hide ();
}
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
new_snap: Snapped Cursor ( squashed commit ) Snapped Cursor is a line that follows the edit point, and indicates where the operation will occur. This replaces and extends the line that appears with the Cut tool. New associated preferences: snap_threshold and show_snap_cursor.
2018-02-09 09:21:45 -05:00
/* There are a few reasons why we might not update the playhead / viewport stuff:
*
* 1. we don't update things when there's a pending locate request, otherwise
* when the editor requests a locate there is a chance that this method
* will move the playhead before the locate request is processed, causing
* a visual glitch.
* 2. if we're not rolling, there's nothing to do here (locates are handled elsewhere).
* 3. if we're still at the same frame that we were last time, there's nothing to do.
*/
if (_pending_locate_request) {
_last_update_time = 0;
return;
}
if (_dragging_playhead) {
_last_update_time = 0;
return;
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (playhead_cursor->current_sample () == sample) {
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
return;
}
Prevent updates to the playhead when a locate is pending after a drag/click is used to move the playhead. There are two problem cases: 1) the drag "fake-located" the playhead, but a redraw happens before the locate itself finishes. 2) the transport emits Session::PositionChanged from Session::non_realtime_stop(), even though this is occuring in the "middle" of the locate process (we stop first). In the first case, the drag code sets _pending_locate_request, since we need this to be true even before the queued SessionEvent for the locate has been processed. So to deal with this case In the second case, we use Session::locate_initiated() to decide if we're in the middle of a locate.
2020-03-25 20:35:28 -04:00
if (!_pending_locate_request) {
playhead_cursor->set_position (sample);
}
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
if (_session->requested_return_sample() >= 0) {
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
_last_update_time = 0;
return;
}
if (!_follow_playhead || pending_visual_change.being_handled) {
/* We only do this if we aren't already
* handling a visual change (ie if
* pending_visual_change.being_handled is
* false) so that these requests don't stack
* up there are too many of them to handle in
* time.
*/
return;
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
if (!_stationary_playhead) {
reset_x_origin_to_follow_playhead ();
} else {
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
samplepos_t const sample = playhead_cursor->current_sample ();
double target = ((double)sample - (double)current_page_samples() / 2.0);
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
if (target <= 0.0) {
target = 0.0;
}
NO-OP: whitespace - remove trailing whitespace - remove space after opening brackets and before closing brackets - add space around operators - do not use '//' for multi-line comments, do not use "//" on line-start to comment-out code breaking indenting (-Wmisleading-indent) - do add a single space after comment-start /*{SPACE}... or //{SPACE}... - reserve duplicate whitespace " " for alignment, remove other duplicate whitespace - use established "TODO" and "XXX" (highlighted keywords) - remove equal-sign series "====" (those indicate merge conflicts)
2018-02-24 07:54:15 -05:00
/* compare to EditorCursor::set_position() */
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
double const old_pos = sample_to_pixel_unrounded (_leftmost_sample);
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
double const new_pos = sample_to_pixel_unrounded (target);
if (rint (new_pos) != rint (old_pos)) {
reset_x_origin (pixel_to_sample (new_pos));
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
}
}
void
Editor::session_going_away ()
{
_have_idled = false;
_session_connections.drop_connections ();
Preserve and restore x and y origin of editor viewport in Editor state. Clean up Editor's update of various things by: 1. merging Editor's handlers of SuperRapidScreenUpdate. 2. separating out work to be done on this update and work to be done on a locate. Hopefully easier to understand this way. git-svn-id: svn://localhost/ardour2/branches/3.0@6648 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 20:25:06 -05:00
super_rapid_screen_update_connection.disconnect ();
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
selection->clear ();
cut_buffer->clear ();
clicked_regionview = 0;
clicked_axisview = 0;
clicked_routeview = 0;
entered_regionview = 0;
entered_track = 0;
Improve playhead updates, reduce jitter for follow PH, stationary PH * resolve rounding mistakes * extrapolate and filter position using GUI timing * track engine's position
2017-03-23 14:21:50 -04:00
_last_update_time = 0;
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
_drags->abort ();
initial commit of hand merging, plus getting "ancient" waf script to work correctly
2013-04-04 00:32:52 -04:00
playhead_cursor->hide ();
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
/* rip everything out of the list displays */
_regions->clear ();
(Source List) Source property signals (gtk2 part) See: https://docs.google.com/document/d/1sI7p9RoRVZtNx2n67RvBa0_16fuZblV_lNkkKN2g93s/edit?usp=sharing
2018-11-15 10:21:55 -05:00
_sources->clear ();
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
_routes->clear ();
_route_groups->clear ();
/* do this first so that deleting a track doesn't reset cms to null
and thus cause a leak.
*/
if (current_mixer_strip) {
if (current_mixer_strip->get_parent() != 0) {
global_hpacker.remove (*current_mixer_strip);
}
delete current_mixer_strip;
current_mixer_strip = 0;
}
/* delete all trackviews */
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
delete *i;
}
track_views.clear ();
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 13:50:37 -04:00
nudge_clock->set_session (0);
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
editor_list_button.set_active(false);
editor_list_button.set_sensitive(false);
/* clear tempo/meter rulers */
remove_metric_marks ();
clear_marker_display ();
new_grid: Rewrite of Snap and Grid. (squashed commit) Separate Snap from Grid. Lots of naming changes. Multiple simultaneous snap options allowed. Grid is one of the possible Snap options. Grid uses the same data as the rulers. Replace complicated tempo_lines with simple grid_lines. The Grid is zoom-scale-sensitive along with the rulers. If you are zoomed out, grid becomes coarser.
2018-02-09 10:59:39 -05:00
hide_grid_lines ();
delete grid_lines;
grid_lines = 0;
Delete tempo lines when session goes away
2017-06-08 11:08:59 -04:00
break out of step editing if a session goes away; do nothing in Editor::located() if the session has gone away git-svn-id: svn://localhost/ardour2/branches/3.0@13229 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-10-10 11:19:58 -04:00
stop_step_editing ();
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
if (own_window()) {
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
/* get rid of any existing editor mixer strip */
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
WindowTitle title(Glib::get_application_name());
title += _("Editor");
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
own_window()->set_title (title.get_string());
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
SessionHandlePtr::session_going_away ();
}
Editor Actions Scripts & Manager
2016-02-23 09:42:53 -05:00
void
Editor::trigger_script (int i)
{
LuaInstance::instance()-> call_action (i);
}
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
void
Editor::show_editor_list (bool yn)
{
if (yn) {
fix editor sidebar show/hide with embedded TimeInfo
2016-12-22 21:56:01 -05:00
_editor_list_vbox.show ();
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
} else {
fix editor sidebar show/hide with embedded TimeInfo
2016-12-22 21:56:01 -05:00
_editor_list_vbox.hide ();
Move a couple of methods into editor.cc, where they seem to be more at home than in editor_mixer.cc git-svn-id: svn://localhost/ardour2/branches/3.0@6647 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-07 18:11:17 -05:00
}
}
step editing now accessed via a context menu on MIDI track rec-enable buttons. along the way, fixed up confusion between set_rec_enable() and set_rec_enabled() methods in Route/Track/Diskstream git-svn-id: svn://localhost/ardour2/branches/3.0@7482 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-07-24 12:40:56 -04:00
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
void
add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588, mostly git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 18:38:56 -05:00
Editor::change_region_layering_order (bool from_context_menu)
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
{
globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
2017-09-18 12:39:17 -04:00
const samplepos_t position = get_preferred_edit_position (EDIT_IGNORE_NONE, from_context_menu);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
if (!clicked_routeview) {
if (layering_order_editor) {
layering_order_editor->hide ();
}
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
return;
}
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (clicked_routeview->route());
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
if (!track) {
return;
}
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
boost::shared_ptr<Playlist> pl = track->playlist();
if (!pl) {
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
return;
}
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
if (layering_order_editor == 0) {
add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588, mostly git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 18:38:56 -05:00
layering_order_editor = new RegionLayeringOrderEditor (*this);
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
}
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
Tidy up RegionLayeringOrderEditor a bit. Add GPL boilerplate. Make it respect edit groups (#3432). git-svn-id: svn://localhost/ardour2/branches/3.0@11324 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 20:31:42 -05:00
layering_order_editor->set_context (clicked_routeview->name(), _session, clicked_routeview, pl, position);
Fix some messed up code (spacey tabs). (There is faar more of this... FIX YOUR EDITORS!) git-svn-id: svn://localhost/ardour2/branches/3.0@8086 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-25 15:37:39 -05:00
layering_order_editor->maybe_present ();
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
}
void
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
Editor::update_region_layering_order_editor ()
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
{
if (layering_order_editor && layering_order_editor->is_visible ()) {
add a new name for the region-layering-editor-action that tells us we were started from a context menu; dialog does not position correctly on first show... grrr. should end fix of #4588, mostly git-svn-id: svn://localhost/ardour2/branches/3.0@11083 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-26 18:38:56 -05:00
change_region_layering_order (true);
major chunk of the region layering editor from 2.X, fwd-ported to 3.0 git-svn-id: svn://localhost/ardour2/branches/3.0@7689 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-25 15:28:33 -04:00
}
}
Put images on the fade in/out menus. Fixes #3411. git-svn-id: svn://localhost/ardour2/branches/3.0@7805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-18 23:31:03 -04:00
void
Editor::setup_fade_images ()
{
fix x-fade icons in context menu
2014-05-28 13:46:31 -04:00
_xfade_in_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadein-linear")));
update fade icons
2014-05-28 16:20:28 -04:00
_xfade_in_images[FadeSymmetric] = new Gtk::Image (get_icon_path (X_("fadein-symmetric")));
_xfade_in_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadein-fast-cut")));
_xfade_in_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("fadein-slow-cut")));
_xfade_in_images[FadeConstantPower] = new Gtk::Image (get_icon_path (X_("fadein-constant-power")));
switch to 5 new fade curves, taken from mixbus2 branch. make xfade context menus functional even though the images are not accurate git-svn-id: svn://localhost/ardour2/branches/3.0@12253 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-11 17:30:36 -04:00
_xfade_out_images[FadeLinear] = new Gtk::Image (get_icon_path (X_("fadeout-linear")));
update fade icons
2014-05-28 16:20:28 -04:00
_xfade_out_images[FadeSymmetric] = new Gtk::Image (get_icon_path (X_("fadeout-symmetric")));
_xfade_out_images[FadeFast] = new Gtk::Image (get_icon_path (X_("fadeout-fast-cut")));
_xfade_out_images[FadeSlow] = new Gtk::Image (get_icon_path (X_("fadeout-slow-cut")));
_xfade_out_images[FadeConstantPower] = new Gtk::Image (get_icon_path (X_("fadeout-constant-power")));
incorrect but visible context menu for xfades git-svn-id: svn://localhost/ardour2/branches/3.0@12243 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-10 15:14:11 -04:00
Put images on the fade in/out menus. Fixes #3411. git-svn-id: svn://localhost/ardour2/branches/3.0@7805 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-18 23:31:03 -04:00
}
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
/** @return Gtk::manage()d menu item for a given action from `editor_actions' */
Gtk::MenuItem&
Editor::action_menu_item (std::string const & name)
{
Fix crash on opening region menu. git-svn-id: svn://localhost/ardour2/branches/3.0@8027 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:25 -05:00
Glib::RefPtr<Action> a = editor_actions->get_action (name);
assert (a);
Delete trailing whitespace git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 13:00:29 -04:00
Fix crash on opening region menu. git-svn-id: svn://localhost/ardour2/branches/3.0@8027 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-14 11:49:25 -05:00
return *manage (a->create_menu_item ());
Tidy up the region menu a bit, and hopefully clarify what regions will be operated on in different circumstances. Make the main menubar Region menu the same as the context one, and use the same logic to sensitize/desensitize actions for them. git-svn-id: svn://localhost/ardour2/branches/3.0@7954 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-03 18:19:29 -04:00
}
Option to show lines below markers (#3529). git-svn-id: svn://localhost/ardour2/branches/3.0@7993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-11-10 13:29:32 -05:00
Make editor list notebook shrink or expand when the tab is double-clicked, as per #3662. git-svn-id: svn://localhost/ardour2/branches/3.0@8443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:06:51 -05:00
void
Editor::add_notebook_page (string const & name, Gtk::Widget& widget)
{
EventBox* b = manage (new EventBox);
b->signal_button_press_event().connect (sigc::bind (sigc::mem_fun (*this, &Editor::notebook_tab_clicked), &widget));
Label* l = manage (new Label (name));
l->set_angle (-90);
b->add (*l);
b->show_all ();
_the_notebook.append_page (widget, *b);
}
bool
Editor::notebook_tab_clicked (GdkEventButton* ev, Gtk::Widget* page)
{
if (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_2BUTTON_PRESS) {
_the_notebook.set_current_page (_the_notebook.page_num (*page));
}
if (ev->type == GDK_2BUTTON_PRESS) {
/* double-click on a notebook tab shrinks or expands the notebook */
if (_notebook_shrunk) {
dramatically simplify maximi[sz]ation code, ripping out all the old pane sizing stuff that seems to be a left over from gtk1 (!) git-svn-id: svn://localhost/ardour2/branches/3.0@11344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 22:03:25 -05:00
if (pre_notebook_shrink_pane_width) {
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
edit_pane.set_divider (0, *pre_notebook_shrink_pane_width);
dramatically simplify maximi[sz]ation code, ripping out all the old pane sizing stuff that seems to be a left over from gtk1 (!) git-svn-id: svn://localhost/ardour2/branches/3.0@11344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 22:03:25 -05:00
}
Make editor list notebook shrink or expand when the tab is double-clicked, as per #3662. git-svn-id: svn://localhost/ardour2/branches/3.0@8443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:06:51 -05:00
_notebook_shrunk = false;
} else {
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
pre_notebook_shrink_pane_width = edit_pane.get_divider();
dramatically simplify maximi[sz]ation code, ripping out all the old pane sizing stuff that seems to be a left over from gtk1 (!) git-svn-id: svn://localhost/ardour2/branches/3.0@11344 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 22:03:25 -05:00
/* this expands the LHS of the edit pane to cover the notebook
PAGE but leaves the tabs visible.
*/
initial sort-of-mostly-working integration of new Pane
2016-05-26 10:46:28 -04:00
edit_pane.set_divider (0, edit_pane.get_divider() + page->get_width());
Make editor list notebook shrink or expand when the tab is double-clicked, as per #3662. git-svn-id: svn://localhost/ardour2/branches/3.0@8443 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-04 21:06:51 -05:00
_notebook_shrunk = true;
}
}
return true;
}
a radically new approach to sizing the track header layout that now allows ardour to shrink dramatically in vertical height. current lower limit is about 763 pixels WITH the editor mixer strip, and something much, much smaller without it git-svn-id: svn://localhost/ardour2/branches/3.0@8608 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-29 09:48:59 -05:00
Add context menu for control points. git-svn-id: svn://localhost/ardour2/branches/3.0@9890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 16:10:31 -04:00
void
Editor::popup_control_point_context_menu (ArdourCanvas::Item* item, GdkEvent* event)
{
using namespace Menu_Helpers;
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Add context menu for control points. git-svn-id: svn://localhost/ardour2/branches/3.0@9890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 16:10:31 -04:00
MenuList& items = _control_point_context_menu.items ();
items.clear ();
NOOP, remove trailing tabs/whitespace.
2015-10-05 10:17:49 -04:00
Add context menu for control points. git-svn-id: svn://localhost/ardour2/branches/3.0@9890 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-07-17 16:10:31 -04:00
items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &Editor::edit_control_point), item)));
items.push_back (MenuElem (_("Delete"), sigc::bind (sigc::mem_fun (*this, &Editor::remove_control_point), item)));
if (!can_remove_control_point (item)) {
items.back().set_sensitive (false);
}
_control_point_context_menu.popup (event->button.button, event->button.time);
}
provide link-editor-and-mixer-selection option. gui implementation is slightly hacky because of the implicit endless loop that the link creates git-svn-id: svn://localhost/ardour2/branches/3.0@10624 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-15 14:33:09 -05:00
Context menu for applying edits to note selection.
2014-12-25 15:32:10 -05:00
void
Editor::popup_note_context_menu (ArdourCanvas::Item* item, GdkEvent* event)
{
using namespace Menu_Helpers;
NoteBase* note = reinterpret_cast<NoteBase*>(item->get_data("notebase"));
if (!note) {
return;
}
/* We need to get the selection here and pass it to the operations, since
popping up the menu will cause a region leave event which clears
entered_regionview. */
MidiRegionView& mrv = note->region_view();
const RegionSelection rs = get_regions_from_selection_and_entered ();
Clarify context menu for midi notes. - right click on a note selects it if unselected or selection empty. - note_context_menu is shown as described in #6348
2015-10-31 14:22:55 -04:00
const uint32_t sel_size = mrv.selection_size ();
Context menu for applying edits to note selection.
2014-12-25 15:32:10 -05:00
MenuList& items = _note_context_menu.items();
items.clear();
Clarify context menu for midi notes. - right click on a note selects it if unselected or selection empty. - note_context_menu is shown as described in #6348
2015-10-31 14:22:55 -04:00
if (sel_size > 0) {
items.push_back(MenuElem(_("Delete"),
sigc::mem_fun(mrv, &MidiRegionView::delete_selection)));
}
Grey out unavailable note context menu items rather than hiding them.
2015-10-31 15:06:31 -04:00
items.push_back(MenuElem(_("Edit..."),
sigc::bind(sigc::mem_fun(*this, &Editor::edit_notes), &mrv)));
if (sel_size != 1) {
items.back().set_sensitive (false);
Clarify context menu for midi notes. - right click on a note selects it if unselected or selection empty. - note_context_menu is shown as described in #6348
2015-10-31 14:22:55 -04:00
}
Introduce "Transpose..." also in the context menu of selected notes.
2015-10-15 09:44:09 -04:00
items.push_back(MenuElem(_("Transpose..."),
sigc::bind(sigc::mem_fun(*this, &Editor::transpose_regions), rs)));
Clarify context menu for midi notes. - right click on a note selects it if unselected or selection empty. - note_context_menu is shown as described in #6348
2015-10-31 14:22:55 -04:00
Grey out unavailable note context menu items rather than hiding them.
2015-10-31 15:06:31 -04:00
items.push_back(MenuElem(_("Legatize"),
sigc::bind(sigc::mem_fun(*this, &Editor::legatize_regions), rs, false)));
if (sel_size < 2) {
items.back().set_sensitive (false);
Clarify context menu for midi notes. - right click on a note selects it if unselected or selection empty. - note_context_menu is shown as described in #6348
2015-10-31 14:22:55 -04:00
}
Context menu for applying edits to note selection.
2014-12-25 15:32:10 -05:00
items.push_back(MenuElem(_("Quantize..."),
sigc::bind(sigc::mem_fun(*this, &Editor::quantize_regions), rs)));
Clarify context menu for midi notes. - right click on a note selects it if unselected or selection empty. - note_context_menu is shown as described in #6348
2015-10-31 14:22:55 -04:00
Grey out unavailable note context menu items rather than hiding them.
2015-10-31 15:06:31 -04:00
items.push_back(MenuElem(_("Remove Overlap"),
sigc::bind(sigc::mem_fun(*this, &Editor::legatize_regions), rs, true)));
if (sel_size < 2) {
items.back().set_sensitive (false);
Clarify context menu for midi notes. - right click on a note selects it if unselected or selection empty. - note_context_menu is shown as described in #6348
2015-10-31 14:22:55 -04:00
}
MIDI transform dialog.
2014-12-28 15:50:57 -05:00
items.push_back(MenuElem(_("Transform..."),
sigc::bind(sigc::mem_fun(*this, &Editor::transform_regions), rs)));
Context menu for applying edits to note selection.
2014-12-25 15:32:10 -05:00
_note_context_menu.popup (event->button.button, event->button.time);
}
Hacky fix for track height step losing 'grip' on the track being resized (#4503). git-svn-id: svn://localhost/ardour2/branches/3.0@12747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-17 12:57:21 -04:00
void
Fix special handling of 'zoom vertical' scroll wheel modifier key. gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of the modifier key used to adjust track heights in conjunction with the scroll wheel, so that the same track continues to be resized even when it's shrunk to no longer be under the mouse cursor. However, this code assumed that the modifier key for this was <Shift>. Fix it to use the event->state bit corresponding to ScrollZoomVerticalModifier instead, and rename the relevant functions to clarify that it's the 'zoom vertical' modifier key they're dealing with. Partially fixes #5610.
2013-07-23 11:15:23 -04:00
Editor::zoom_vertical_modifier_released()
Hacky fix for track height step losing 'grip' on the track being resized (#4503). git-svn-id: svn://localhost/ardour2/branches/3.0@12747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-17 12:57:21 -04:00
{
_stepping_axis_view = 0;
}
make the icon set selector actually do something
2014-06-10 14:39:08 -04:00
void
Editor::ui_parameter_changed (string parameter)
{
if (parameter == "icon-set") {
do most of the work related to adding new anchored trim cursors (but debugging/analysis continues)
2014-06-13 17:15:23 -04:00
while (!_cursor_stack.empty()) {
Fix various cursor problems. Add a new scoped cursor system that makes it much harder to screw up and end up with stick cursors and so on.
2014-12-20 01:11:28 -05:00
_cursor_stack.pop_back();
do most of the work related to adding new anchored trim cursors (but debugging/analysis continues)
2014-06-13 17:15:23 -04:00
}
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
_cursors->set_cursor_set (UIConfiguration::instance().get_icon_set());
Fix various cursor problems. Add a new scoped cursor system that makes it much harder to screw up and end up with stick cursors and so on.
2014-12-20 01:11:28 -05:00
_cursor_stack.push_back(_cursors->grabber);
set editor pane cursors
2016-05-27 12:59:07 -04:00
edit_pane.set_drag_cursor (*_cursors->expand_left_right);
editor_summary_pane.set_drag_cursor (*_cursors->expand_up_down);
new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged)
2014-06-30 16:32:38 -04:00
} else if (parameter == "draggable-playhead") {
if (_verbose_cursor) {
Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files
2015-01-02 09:44:54 -05:00
playhead_cursor->set_sensitive (UIConfiguration::instance().get_draggable_playhead());
new UI config var to allow playhead to be optionally draggable (default is: yes, it can be dragged)
2014-06-30 16:32:38 -04:00
}
permit editing velocity bars option
2018-07-03 15:39:28 -04:00
} else if (parameter == "use-note-bars-for-velocity") {
ArdourCanvas::Note::set_show_velocity_bars (UIConfiguration::instance().get_use_note_bars_for_velocity());
_track_canvas->request_redraw (_track_canvas->visible_area());
respond to changes in use-note-color-for-velocity
2018-07-03 17:02:20 -04:00
} else if (parameter == "use-note-color-for-velocity") {
make use-note-color-for-velocity much much more efficient (by not invoking the global color change signal)
2018-07-03 18:33:11 -04:00
/* handled individually by each MidiRegionView */
make the icon set selector actually do something
2014-06-10 14:39:08 -04:00
}
}
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
Gtk::Window*
save/restore tabbable state
2015-07-09 12:40:51 -04:00
Editor::use_own_window (bool and_fill_it)
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
{
bool new_window = !own_window();
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
save/restore tabbable state
2015-07-09 12:40:51 -04:00
Gtk::Window* win = Tabbable::use_own_window (and_fill_it);
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
if (win && new_window) {
win->set_name ("EditorWindow");
ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Editor"), this);
// win->signal_realize().connect (*this, &Editor::on_realize);
rework dialog-close-focus-reset change to work in Tabbed
2016-02-22 14:42:40 -05:00
win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
win->signal_event().connect (sigc::mem_fun (*this, &Editor::generic_event_handler));
more changes to Bindings, Keyboard APIs
2015-08-10 14:31:59 -04:00
win->set_data ("ardour-bindings", bindings);
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
update_title ();
}
DisplaySuspender ds;
contents().show_all ();
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
/* XXX: this is a bit unfortunate; it would probably
be nicer if we could just call show () above rather
than needing the show_all ()
*/
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
/* re-hide stuff if necessary */
editor_list_button_toggled ();
parameter_changed ("show-summary");
parameter_changed ("show-group-tabs");
parameter_changed ("show-zoom-tools");
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
/* now reset all audio_time_axis heights, because widgets might need
to be re-hidden
*/
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
TimeAxisView *tv;
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
tv = (static_cast<TimeAxisView*>(*i));
tv->reset_height ();
}
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
if (current_mixer_strip) {
current_mixer_strip->hide_things ();
current_mixer_strip->parameter_changed ("mixer-element-visibility");
}
replicate the remove-all-trailing whitespace commit(s) in master
2015-10-26 14:35:06 -04:00
first compilable version of tabbable design. I would have loved to split this apart, but there are just so many interrelated changes, it makes little sense and would be a huge effort that would break future git bisect use because so many intermediate commits would not compile
2015-07-07 22:12:21 -04:00
return win;
}
Copy Permalink