Paul Licameli
b7dc2561b6
Merge branch 'master' into scrubbing2
2016-04-27 18:36:10 -04:00
Paul Licameli
68eda0f802
Cursor line in the ruler should always follow that in TrackPanel, as after "j"
2016-04-27 17:48:55 -04:00
Paul Licameli
5086260a60
fix build
2016-04-27 17:45:53 -04:00
Paul Licameli
bf6abc8f6c
Merge branch 'scrubbing'
...
* scrubbing:
Draw the play or record head in the ruler in their former sizes.
2016-04-27 12:42:48 -04:00
Paul Licameli
926dfb7253
Draw the play or record head in the ruler in their former sizes.
2016-04-27 12:41:49 -04:00
Paul Licameli
0e31c23c98
Change transport toolbar image for scrubbing. Darker outline.
2016-04-27 11:54:22 -04:00
Paul Licameli
85e7bf670d
Change transport toolbar image for scrubbing. Darker outline.
2016-04-27 11:50:43 -04:00
Paul Licameli
d8fd3dd09b
Merge branch 'master' into scrubbing
2016-04-27 11:50:27 -04:00
Paul Licameli
5474ff752d
Fix compilation of EXPERIMENTAL_THEMING
2016-04-27 10:49:19 -04:00
Paul Licameli
3154b78b0f
Fix assertions and crashes in context menu for scrubber
2016-04-26 15:38:27 -04:00
Paul Licameli
6a1d387093
Fix assertions and crashes in context menu for scrubber
2016-04-26 15:37:55 -04:00
Paul Licameli
d0a8e33e1c
Scrubbing Phase 2 -- (left or right or double) click the play head in the ruler
2016-04-26 12:17:50 -04:00
Paul Licameli
9ab0e42f29
Control scrub with motion, click, drag, wheel almost anywhere in main window...
...
... if the event is not handled and skipped by sub-windows first, such as for
toolbar button clicks.
(But track panel clicks are skipped even after doing something, so they may
also cause seeking besides other responses. So click can seek AND set cursor.)
This is meant to make drag to seek and wheel for change of speed easier,
without needing to keep the mouse in the narrow time ruler.
Also lets you click in the ruler, then move in any direction, and not miss the
motion event that should start the scrub playback.
The event handling is a bit of a hack, using propagation. It does not use
capture.
2016-04-26 12:12:06 -04:00
Paul Licameli
3d222bcd87
Context menu for scrubbing in the ruler
2016-04-26 12:12:06 -04:00
Paul Licameli
c12993a53b
Simplify with more uses of HideQuickPlayIndicator()
2016-04-26 12:12:06 -04:00
Paul Licameli
cd57e0a26c
Scrubbing phase 2. Scrub starts with click on the indicator in the ruler...
...
... and works in any of the six tools.
Click and drag in select tool during scrub works just as when not scrubbing.
Seeks now only if you left-click or drag in the ruler, but this may change.
Mouse motion anywhere on the screen controls scrub as before.
No mouse clicks in TrackPanel are used by scrubbing.
The Ctrl-Click in TrackPanel is now unused. Should 2.1.0 behavior be restored?
That was click to quick play, redundant with click in the (lower part of) the
ruler.
2016-04-26 12:12:06 -04:00
Paul Licameli
4deb90c633
ESC leaves scrubbing even when clicked only; disable scrub menu items when...
2016-04-26 09:04:02 -04:00
Paul Licameli
b0d2f38786
ESC leaves scrubbing even when clicked only; disable scrub menu items when...
...
... another project is playing
2016-04-26 09:02:38 -04:00
Paul Licameli
765799660f
Update the status bar message as left button switches in an out of seeking.
2016-04-25 16:05:30 -04:00
Paul Licameli
6d2528ae10
Update the status bar message as left button switches in an out of seeking.
2016-04-25 16:04:24 -04:00
Paul Licameli
d6e7796aa0
When changing the scrub mode via menu command or shortcut, update status bar
2016-04-25 15:44:02 -04:00
Paul Licameli
a57ef7a560
When changing the scrub mode via menu command or shortcut, update status bar
2016-04-25 15:43:26 -04:00
Paul Licameli
5be4f60a4e
Merge branch 'master' into scrubbing
2016-04-25 15:32:02 -04:00
Gale Andrews
aab32215ca
Best not to use "g" for access keys
...
because the tail of the "g" obscures the underline
2016-04-25 17:24:37 +01:00
Paul Licameli
db4041e741
Change drawing of quick play indicator. It can be green for scrubbing...
...
Hide quick play indicator when other playback starts...
2016-04-25 12:20:37 -04:00
Paul Licameli
ea0274b5fa
Change drawing of quick play indicator. It can be green for scrubbing...
...
... But this isn't used yet. Also make the scrub head bigger.
2016-04-25 12:19:47 -04:00
Paul Licameli
0071db6f53
Hide quick play indicator when other playback starts...
...
... but it can reappear when mouse moves. You may still select a quick play
region during play, to jump playback.
2016-04-25 12:00:58 -04:00
Paul Licameli
8b2729f4a2
Merge branch 'master' into scrubbing
2016-04-25 12:00:29 -04:00
Paul Licameli
d34715d6ad
Various other drags could crash Mac debug build if you option-W. Fixed too...
...
... And I think this fix is now exhaustive.
2016-04-25 01:49:54 -04:00
Paul Licameli
ece29b3ff3
Likewise, don't crash on command-W while dragging in the timeline ruler.
2016-04-25 01:38:07 -04:00
Paul Licameli
cb245d2f79
Drag a slider like input gain, and hit command-W. Don't crash (debug build)!
2016-04-25 01:33:49 -04:00
Paul Licameli
1bdd1a07ab
Similarly for Equalization: avoid assertion in debug build, if you ESC...
...
... while dragging a point in "Draw Curves".
2016-04-25 01:04:38 -04:00
Paul Licameli
08eb840f32
You could get an assertion, on Mac debug build at least, ...
...
if you hit ESC during drag in the Autoduck dialog. This fixes that.
2016-04-24 23:56:15 -04:00
Paul Licameli
26d317319a
Merge pull request #126 from henricj/ignore_user
...
Ignore Visual Studio .vcxproj.user files.
2016-04-24 22:04:42 -04:00
henric
09361b56fd
Ignore Visual Studio .vcxproj.user files.
2016-04-24 18:51:42 -07:00
Paul Licameli
841759469a
Supply missing #include
2016-04-24 21:36:13 -04:00
Paul Licameli
e988646bdb
Supply missing #include
2016-04-24 21:36:00 -04:00
Paul Licameli
7f5e378573
Oops, fix crash in the previous.
2016-04-24 19:08:52 -04:00
Paul Licameli
853dff4106
Oops, fix crash in the previous.
2016-04-24 19:08:40 -04:00
Paul Licameli
c7feb793c5
Vary status string (leftmost in the status bar) for the four kinds of scrub.
2016-04-24 16:17:22 -04:00
Paul Licameli
6147705199
Vary status string (leftmost in the status bar) for the four kinds of scrub.
2016-04-24 16:13:07 -04:00
Paul Licameli
0d5a409e9a
Merge branch 'master' into scrubbing
2016-04-24 15:00:41 -04:00
windinthew
a7b4833b3c
Merge remote-tracking branch 'audmain/master' into work
2016-04-24 17:50:58 +01:00
Paul Licameli
5d7438cc70
Uncheck scrubbing menu items whenever scrub stops (ESC key, Stop button, other)
2016-04-24 12:00:03 -04:00
Paul Licameli
1fe0bbf7dc
Uncheck scrubbing menu items whenever scrub stops (ESC key, Stop button, other)
2016-04-24 11:59:01 -04:00
Paul Licameli
e0c80a8d20
Merge branch 'master' into scrubbing
2016-04-24 11:13:26 -04:00
Paul Licameli
3dc7524014
Bug1318 fixed again so that generators and effects on Windows still work
2016-04-24 10:33:37 -04:00
Paul Licameli
f2c6fbfc1b
Bug1318 fixed again so that generators and effects on Windows still work
2016-04-24 10:32:20 -04:00
Paul Licameli
bc80ffe766
Windows build fixes
2016-04-24 01:12:42 -04:00
Paul Licameli
89e33da072
Merge branch 'master' of github.com:audacity/audacity
2016-04-24 01:04:22 -04:00