summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_rulers.cc
AgeCommit message (Collapse)Author
2014-06-12remove no-longer-used codePaul Davis
2014-06-12add canvas rulers event dispatch and reinstate scrolling behaviourPaul Davis
2014-06-12use new ArdourCanvas::Ruler constructorPaul Davis
2014-06-12remove header file includes of now-removed gtk custom rulerPaul Davis
2014-06-11use canvas rulers now instead of gtk widgetsPaul Davis
Some bugs that exist in master are still present.
2014-06-03remove useless groups from timebar area, clarify scroll group naming in editorPaul Davis
2014-05-14fix rounding error in the min:sec rulerDevin J. Pohly
When zoomed in to the millisecond level, the framerate was being divided by 1000 as an integer to generate a ruler tick interval, which doesn't work so well at things like 44100 or 88200. Instead, just count this value in milliseconds, dividing by 1000 when we are done. This was purely a display issue - the grid was in the correct place.
2014-05-14fix major/minor ticks on min:sec rulerDevin J. Pohly
All ticks from 0:00.000 to 0:00.999... were major, and everything after was minor, instead of the correct distribution.
2014-02-26convert canvas_event_frame() and window_event_frame() to ↵Paul Davis
canvas_event_sample() and window_event_sample() to go along with the convention adopted in cairocanvas code re: frames+samples
2014-02-25indent/alignPaul Davis
2014-01-10Merge windows+cc branch into cairocanvas branch. Not finished, need to now ↵Paul Davis
merge windows branch to get changes from there
2014-01-04fix dragging playhead using time rulersRobin Gareus
2013-09-21Merge remote-tracking branch 'remotes/origin/cairocanvas' into windowsJohn Emmas
Conflicts (hopefully resolved): gtk2_ardour/marker.cc gtk2_ardour/midi_region_view.h gtk2_ardour/region_gain_line.h gtk2_ardour/utils.cc gtk2_ardour/video_image_frame.cc gtk2_ardour/wscript libs/backends/jack/wscript
2013-07-17Fix ambiguous type CheckMenuItem that is also defined via windows.hTim Mayberry
2013-04-18fix various event coordinate system problems with button events on the rulersPaul Davis
2013-04-17fix playhead dragging from rulersPaul Davis
2013-04-17various work waveview amplitude mgmt; fix playhead cursor drag from timebar ↵Paul Davis
click
2013-04-17vtl: get rid of one more unnecessary canvas-groupRobin Gareus
2013-04-12change frames_per_pixel to samples_per_pixelPaul Davis
2013-04-12leftmost_position => leftmost_sample, current_page_frames => ↵Paul Davis
current_page_samples
2013-04-12change all frame_to_pixel and pixel_to_frame to sample_to_pixel and ↵Paul Davis
pixel_to_sample
2013-04-11Merge branch 'master' into cairocanvasRobin Gareus
Conflicts: gtk2_ardour/editor.h gtk2_ardour/editor_canvas.cc gtk2_ardour/wscript
2013-04-11enable videotimeline by defaultRobin Gareus
2013-04-06vtl: make videotimeline work with new cairo canvasRobin Gareus
timeline thumbnail display, moving (drag/drop) and zoom works. There still some crashes e.g. resizing the height of the timeline and with off-screen image buffering when zooming in. Likely due to concurrency issues: VideoImageFrame::exposeimg() and direct access of the pixbuf: "Assertion `!_bounding_box_dirty' failed." in canvas/item.cc:191 more work is needed..
2013-04-04initial commit of hand merging, plus getting "ancient" waf script to work ↵Paul Davis
correctly
2013-03-13videotimlineRobin Gareus
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2012-11-28fix initial display of BBT ruler, i believePaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@13560 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-27adjust the way we use a pair of iterators into the tempo map so that the ↵Paul Davis
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-10-18fix computation of fixed ruler scales done before canvas width is set by ↵Paul Davis
allocation handler (fixes #5065 and #5095) git-svn-id: svn://localhost/ardour2/branches/3.0@13307 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-19Add option to add new range marker from the context menu without needing the ↵Carl Hetherington
keyboard (#4378). git-svn-id: svn://localhost/ardour2/branches/3.0@12781 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-14support a grid of beats/64 and beats/128Paul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@11490 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-19more fixups of various things including cursors when note editing. in ↵Paul Davis
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-06partially revert some of the recent work on tempo to reflect new ↵Paul Davis
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-04use BBTPoint::is_bar() rather than ::beat == 1 ; implement ↵Paul Davis
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-03save 4 bytes per Bar|Beat point in the tempo mapPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@11147 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-03return two iterators into the Bars|Beats list of the tempo map rather than ↵Paul Davis
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-02new approach to tempo/meter: compute and store the entire map (every ↵Paul Davis
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
2011-12-21remove commentPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@11045 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-19rename Timecode::BBT_Time::ticks_per_beat to ↵Paul Davis
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-13more fun and games with meter and the tempo map: rename ↵Paul Davis
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-09Patch from colinf to fix reversed scroll in timeline rulersCarl Hetherington
wrt editor pane (#4549). git-svn-id: svn://localhost/ardour2/branches/3.0@10950 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30fixes for 98% of all the warnings/errors reported by OS X gcc on tigerPaul Davis
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-04-19Cleanup some more gint -> bools.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@9374 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-18Remove menu items that do nothing (#2451).Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@8900 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18Rename Frames ruler to Samples.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@8529 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18Tidy up the ruler code slightly.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@8528 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-18Make the frames ruler behave more like the other time-based rulers when the ↵Carl Hetherington
editor window is resized. git-svn-id: svn://localhost/ardour2/branches/3.0@8527 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-15Make sure minsec ruler works when it is first enabled.Carl Hetherington
git-svn-id: svn://localhost/ardour2/branches/3.0@8514 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-14move ticks per beat from Meter to Timecode::BBT_Time, add new constructor ↵Paul Davis
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-14Rename libmusictime libtimecode (consistent with already used namespace ↵David Robillard
"Timecode"). Move BBT_Time to libtimecode. git-svn-id: svn://localhost/ardour2/branches/3.0@8271 d708f5d6-7413-0410-9779-e7cbd77b26cf
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-24 05:54:46 +0000