ardour/livetrax
13
0
Fork 0
Code
9,474 Commits 1 Branch 1 Tag 194 MiB
feec5f9ad1
Commit Graph

97 Commits

Author SHA1 Message Date
Paul Davis
3e59452fa0 fix computation of fixed ruler scales done before canvas width is set by allocation handler (fixes #5065 and #5095) 
git-svn-id: svn://localhost/ardour2/branches/3.0@13307 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-10-18 15:38:04 +00:00
Carl Hetherington
d54fb5f54e Add option to add new range marker from the context menu without needing the keyboard (#4378). 
git-svn-id: svn://localhost/ardour2/branches/3.0@12781 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-06-19 13:54:28 +00:00
Paul Davis
ed62609e80 support a grid of beats/64 and beats/128 
git-svn-id: svn://localhost/ardour2/branches/3.0@11490 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-02-14 22:15:25 +00:00
Paul Davis
f758ed0f41 more fixups of various things including cursors when note editing. in particular, don't needlessly reset the cursor during a drag. note insertion with ctrl pressed now only works if in MouseObject mode. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11270 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-19 22:23:28 +00:00
Paul Davis
355183f1ab partially revert some of the recent work on tempo to reflect new understanding of the problem. behaviour is now believed to be totally correct but awaiting a bit more testing 
git-svn-id: svn://localhost/ardour2/branches/3.0@11171 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-06 16:39:40 +00:00
Paul Davis
b1a33855ce use BBTPoint::is_bar() rather than ::beat == 1 ; implement TempoMap::framepos_plus_{beats,bbt}() with new map structure (not totally finished or accurate yet); prevent crash when dragging a marker to replace the initial tempo/meter markers 
git-svn-id: svn://localhost/ardour2/branches/3.0@11154 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-04 02:49:01 +00:00
Paul Davis
bc003a539b save 4 bytes per Bar|Beat point in the tempo map 
git-svn-id: svn://localhost/ardour2/branches/3.0@11147 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 19:03:13 +00:00
Paul Davis
2a200bdc0e return two iterators into the Bars|Beats list of the tempo map rather than making a copy; use iterators in the GUI 
git-svn-id: svn://localhost/ardour2/branches/3.0@11146 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-03 18:43:58 +00:00
Paul Davis
69c7dac1a1 new approach to tempo/meter: compute and store the entire map (every bar|beat point), thus enabling us to use the same computation to set the BBT points AND the metric markers (tempo + meter) on the audio timeline. It is known that snapping to the BBT grid doesn't work correctly right now, but this probably caused by the separate code in TempoMap::round_to_type() and i'll dig into that tomorrow. Note that the Bar|beat point list is evaluated "lazily" - we'll never store more than anyone actually needs to display or know, other than 1 minute's worth starting from frame zero 
git-svn-id: svn://localhost/ardour2/branches/3.0@11129 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2012-01-02 04:04:14 +00:00
Paul Davis
a9adbd9404 remove comment 
git-svn-id: svn://localhost/ardour2/branches/3.0@11045 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-21 02:11:03 +00:00
Paul Davis
e9b4f14668 rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_division which is a more accurate and informative name. The number doesn't describe the smallest division of a "beat" (which is only defined contextually anyway), but rather the smallest division of the the divisions of a bar. If using a meter of 4/8, there are 4 divisions per bar, and we can divide each one into ticks_per_bar_division pieces; in a separate meter (section) of 3/8, there are 3 divisions per bar, each of which can be divided into ticks_per_bar_division_pieces. 
git-svn-id: svn://localhost/ardour2/branches/3.0@11022 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-19 19:44:43 +00:00
Paul Davis
e0cf3b6354 more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects 
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-13 02:46:36 +00:00
Carl Hetherington
31264fbe43 Patch from colinf to fix reversed scroll in timeline rulers 
wrt editor pane (#4549).


git-svn-id: svn://localhost/ardour2/branches/3.0@10950 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-12-09 18:22:40 +00:00
Paul Davis
0938a42440 fixes for 98% of all the warnings/errors reported by OS X gcc on tiger 
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-09-30 17:55:14 +00:00
Carl Hetherington
28c53d0f92 Cleanup some more gint -> bools. 
git-svn-id: svn://localhost/ardour2/branches/3.0@9374 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-04-19 10:43:43 +00:00
Carl Hetherington
fb41ea0724 Remove menu items that do nothing (#2451). 
git-svn-id: svn://localhost/ardour2/branches/3.0@8900 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-02-18 01:08:39 +00:00
Carl Hetherington
58b207b190 Rename Frames ruler to Samples. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8529 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-18 12:51:02 +00:00
Carl Hetherington
756ffc26bf Tidy up the ruler code slightly. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8528 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-18 01:16:05 +00:00
Carl Hetherington
64d82d9a8e Make the frames ruler behave more like the other time-based rulers when the editor window is resized. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8527 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-18 01:00:27 +00:00
Carl Hetherington
64abea1db2 Make sure minsec ruler works when it is first enabled. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8514 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2011-01-15 00:59:58 +00:00
Paul Davis
f09524b9d3 move ticks per beat from Meter to Timecode::BBT_Time, add new constructor for BBT_Time based on a double value; reduce BeatFramesConverted to 1 liners pending likely removal 
git-svn-id: svn://localhost/ardour2/branches/3.0@8277 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-14 20:28:37 +00:00
David Robillard
4b861e6039 Rename libmusictime libtimecode (consistent with already used namespace "Timecode"). 
Move BBT_Time to libtimecode.


git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-14 18:13:37 +00:00
Carl Hetherington
73192bc1a7 Remove all use of nframes_t. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-03 22:26:29 +00:00
Carl Hetherington
bce9a0aee7 Revert previous incorrect patch. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8144 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-01 17:51:17 +00:00
Carl Hetherington
f500846fd4 Remove unused timecode offset stuff. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8143 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-12-01 17:42:18 +00:00
Carl Hetherington
8fc660e76e 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 14:53:16 +00:00
Paul Davis
b85b4d9e54 make ardour3 build and link on OS X (tiger, at least) 
git-svn-id: svn://localhost/ardour2/branches/3.0@8018 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-13 05:14:48 +00:00
Carl Hetherington
4527566217 Visual tweaks to marker lines. 
git-svn-id: svn://localhost/ardour2/branches/3.0@8011 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-11-11 15:21:37 +00:00
Paul Davis
ede4ecbb00 megaopus patch #2 for today: remove nframes64_t and sframes_t from source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 18:20:37 +00:00
Paul Davis
10bdce85a0 megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t 
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-09-17 16:24:22 +00:00
Carl Hetherington
35cd944f40 Add Beat/20 grid subdivision. Fixes #3126. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7627 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-08-15 10:33:31 +00:00
Carl Hetherington
e3b0cb086d Clean up snap-to code in various places. Fix a couple of typos. Should fix #3165 and #3172. 
git-svn-id: svn://localhost/ardour2/branches/3.0@7152 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-25 00:35:53 +00:00
Paul Davis
ec01a25ec1 add 8 more beat subdivisions, as per #3126 
git-svn-id: svn://localhost/ardour2/branches/3.0@7099 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2010-05-13 18:51:59 +00:00
Carl Hetherington
11bd4eed89 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 16:14:49 +00:00
Paul Davis
f6fdd8dcbf 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 18:24:23 +00:00
Paul Davis
8687895abb 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 15:02:15 +00:00
Paul Davis
64dc5427e4 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 23:29:48 +00:00
David Robillard
c83e48e07a Trim session.h include dependency tree. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5979 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-30 15:30:22 +00:00
Paul Davis
0cc0c13444 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 23:43:04 +00:00
Paul Davis
fa5aeb7892 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 14:38:58 +00:00
David Robillard
bb9cc45cd2 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 16:10:01 +00:00
Paul Davis
e488378d42 string_is_affirmative() fix for 3.0 
git-svn-id: svn://localhost/ardour2/branches/3.0@5723 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-10-02 20:53:31 +00:00
Carl Hetherington
b65f8073ba Fix some unused parameter warnings. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5403 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-21 15:55:17 +00:00
Carl Hetherington
402cc384ce 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 17:58:13 +00:00
Carl Hetherington
4297071b3f Use shared_ptr for the TimeAxisView hierarchy. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5339 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-07-09 13:39:45 +00:00
Carl Hetherington
b192de88b6 Some cleanups to ruler drags. 
git-svn-id: svn://localhost/ardour2/branches/3.0@5185 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-06-14 13:31:46 +00:00
Carl Hetherington
804da56531 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 17:52:51 +00:00
Carl Hetherington
962efaf05e 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 18:25:59 +00:00
Carl Hetherington
015fc7b39f First stage of options rework. 
- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.

- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.

- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.



git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2009-05-14 00:13:27 +00:00
David Robillard
e0aaed6d65 *** 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 18:26:51 +00:00