smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity
10259 commits 101 branches 144 tags 310 MiB
Commit graph

5237 commits

Author SHA1 Message Date
Paul Davis
204da61f98 remove incorrect merge of cairocanvas patch that stopped most tracks from displaying; add more debugging info 2013-04-10 14:42:36 -04:00
Paul Davis
9a8ee11f65 Merge branch 'master' into cairocanvas 2013-04-10 12:37:16 -04:00
Paul Davis
a1745f2cf1 remove debugging output 2013-04-10 10:53:21 -04:00
Paul Davis
97da762c50 make size/shape of playhead cursor match gnomecanvas version 2013-04-10 10:24:17 -04:00
Paul Davis
6592c8696a Merge branch 'master' of git.ardour.org:ardour/ardour 2013-04-09 14:25:02 -04:00
Paul Davis
bca507a808 Merge branch 'master' into cairocanvas 2013-04-09 14:23:41 -04:00
Paul Davis
053eaf77fd a variety of fixes for the cairocanvas, but it still buggy as hell handling events and lots of other stuff 2013-04-09 14:22:58 -04:00
Robin Gareus
082de27a4e vtl: query video-monitor-state on explicit session save 2013-04-09 17:13:42 +02:00
Paul Davis
722d7f4de6 update all i18n .po files 2013-04-09 09:32:14 -04:00
Robin Gareus
ed1f310f10 vtl: rework session-needs-save logic 
* videotimeline now immediately marks the session dirty on
  every state-changing operation
* video-montor is polled every 2.5 seconds for menu-relevant state info
  (ontop, OSD,..) and every 30 seconds for full state (window pos, size,..)
* new interface to query the video-monitor for its state and wait for
  all replies - terminating the process and using ::wait() is no longer
  required
* Ardour> quit and Ardour > close-session does no longer close the video
  session to enforce video-monitor state sync but uses above new interface
 2013-04-09 04:05:46 +02:00
Robin Gareus
49ddf8ecce vtl: disconnect from session-save signal 
the videotimeline is a global unique instance that is allocated during
startup and deleted on exit. The Scopedconnection is not deleted
with the session.
 2013-04-09 04:05:42 +02:00
Robin Gareus
8a3ebe7510 vtl: resume if "don't close/exit" is selected 2013-04-09 04:05:34 +02:00
Paul Davis
18048747b6 fix up marker text color 2013-04-08 19:47:54 -04:00
Robin Gareus
f7abf2de82 vtl: mark session dirty if video position-lock or timeline height changes 2013-04-08 21:17:48 +02:00
Robin Gareus
c7daf40358 mark session dirty if video is moved 2013-04-08 21:11:17 +02:00
Robin Gareus
8630fd1703 add session save signal and hook-up videotimeline 2013-04-08 19:51:48 +02:00
Julien de Kozak
019af63914 Fix name spelling 2013-04-08 19:23:38 +02:00
Paul Davis
22b3744fb8 remove message about checking for announcements 2013-04-08 12:00:19 -04:00
Paul Davis
23cac60a2f add julien dekozak to the authors list 2013-04-08 09:30:39 -04:00
Paul Davis
fc787fad50 canvas markers now use ArdourCanvas::Text, not ArdourCanvas::Pixbuf, since the latter will be optimized to use Pixbuf too 2013-04-06 16:39:11 -04:00
Paul Davis
6b5846ab95 fix up unusued args warning in nsm code 2013-04-06 16:38:29 -04:00
Paul Davis
81506ea41c Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas 2013-04-06 16:12:27 -04:00
Paul Davis
30968b8542 merge with master, including manual merge conflict resolution 2013-04-06 16:12:15 -04:00
Paul Davis
cd6cbba299 rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit 2013-04-06 16:04:02 -04:00
Robin Gareus
6830d83236 vtl: make videotimeline work with new cairo canvas 
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-06 04:10:27 +02:00
Paul Davis
67e4f49064 Merge branch 'master' of git.ardour.org:ardour/ardour 2013-04-05 22:05:33 -04:00
Paul Davis
cd0d68a591 mark the step entry dialog as a dialog even though it is an ArdourWindow, to help with WM layering issues 2013-04-05 18:00:59 -04:00
Paul Davis
8eef4b1904 master merge; new files not added after initial cairocanvas patch application 2013-04-05 17:16:33 -04:00
Colin Fletcher
6c7a61f6e5 Fix display of Spectral Analysis when no tracks are selected. 
Spectral Analysis now displays graphs for selected regions, even when there
are no tracks selected. Fixes #2226.
 2013-04-05 17:49:31 +01:00
Paul Davis
fcf7530676 Merge branch 'nsm' of https://github.com/royvegard/ardour 2013-04-05 12:00:42 -04:00
Paul Davis
55a1048094 Merge branch 'patches' of https://github.com/jdekozak/ardour 2013-04-05 11:54:34 -04:00
Paul Davis
07a505b1b2 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
Colin Fletcher
096fe04e61 Make track header faders insensitive to vertical scroll-wheel events again. 
This effectively reverts d235a27a, and restores the behaviour to that of
Ardour 2.
 2013-04-05 10:08:36 +01:00
Paul Davis
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04:00
Robin Gareus
3f97d8c6d5 vtl: remove obvious warning 2013-04-05 00:15:57 +02:00
Robin Gareus
7fe22a7af3 vtl: overall export progress bar 2013-04-04 23:40:36 +02:00
Robin Gareus
b358a09165 vtl: A/V sync lock on import 
When extracting and importing audio from a video,
mark the audio region's position as locked to the
video.

While locked, the audio region can only be moved
by moving the video with a granularity of one Timecode
frame.
 2013-04-04 15:44:32 +02:00
Robin Gareus
d982887e32 vtl: re-order view menu entries 2013-04-04 15:38:30 +02:00
Paul Davis
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
Robin Gareus
b4e5eb3c8b vtl: audio-export progress-bar tweaks 
use the same concept as session > export > audio;
hopefully this fixes jack-disconnects during export.
 2013-04-04 01:05:53 +02:00
Robin Gareus
1040801ffe vtl: video-monitor letterbox & orig-zoom to menu 2013-04-04 01:05:49 +02:00
Colin Fletcher
ddfc047f0e Update region_ops.txt to match current behaviour, and fix a couple of comments. 
Update region_ops.txt to better describe the current behaviour of
Editor::get_regions_from_selection_and_edit_point(), and fix a couple of
comments that still referred to the no-longer-existing 'edit' property of
route groups.
 2013-04-03 23:21:53 +01:00
Robin Gareus
9301991f6e vtl: video-monitor interaction 
* Menu > View > Video Monitor -- bi-directional communication
with xjadeo for window-state and OSD.
* fix saving state on session close (wait for xjadeo to terminate)
 2013-04-03 22:29:37 +02:00
Robin Gareus
399aee309d vtl: use mpeg4 with intra frames for internal seek format 2013-04-03 22:29:33 +02:00
Colin Fletcher
47efae83d1 Don't include unselected regions in edit grouped region operations. 
Make Editor::get_regions_from_selection_and_entered() only return regions
that are actually selected or entered, not their unselected equivalents.
 2013-04-03 18:21:12 +01:00
Colin Fletcher
b49f2a10d2 Ignore track selection if there are any selected regions. 
Make Editor::get_regions_from_selection_and_edit_point() only consider the
selected tracks when finding regions to operate on if there are no regions
selected, and never if the edit point is 'mouse'.
 2013-04-03 17:29:34 +01:00
Colin Fletcher
f4a9c02b1d Use selection->regions instead of Editor::get_regions_from_selection() 
Remove Editor::get_regions_from_selection(), and use selection->regions
directly in the few places it was called.
 2013-04-03 17:04:04 +01:00
Roy Vegard Ovesen
11747ab16c Enable snapshots and port connect on startup 2013-04-03 17:50:59 +02:00
Paul Davis
ec6dd2dc8b Merge branch 'nsm' of https://github.com/royvegard/ardour 2013-04-03 10:35:47 -04:00
Roy Vegard Ovesen
810a603fb2 Prevent infinite loops 2013-04-03 16:18:42 +02:00