13
0
Commit Graph

5656 Commits

Author SHA1 Message Date
af191fddca limit width of meterbridge window -> align right metrics 2013-07-10 15:27:09 +02:00
ab13954404 remove meterbridge height debug code 2013-07-10 15:27:09 +02:00
c72702883b meterbridge potential fix viewport alignment (+debug msg) 2013-07-10 15:27:09 +02:00
2caf5c8818 clean up 8a9e381f - make meterbridge solid background permanent 2013-07-10 15:27:09 +02:00
daca3ac45c meterbridge move metric outside of scroll area 2013-07-10 15:27:09 +02:00
3ac592bcb0 fix initial size of meterbridge window 2013-07-10 15:27:09 +02:00
fbc324ee81 adjust-width/redraw track-header when meter changes 2013-07-10 15:27:09 +02:00
40493e06ee dynamically change metebridge metrics (midi|audio) 2013-07-10 15:27:09 +02:00
6e661e734b meterbridge label color 2013-07-10 15:27:09 +02:00
2c55f1c70c temp. disable meterbridge type-dependent backgroud color 2013-07-10 15:27:08 +02:00
580cec03ad add shade gradient to meter 2013-07-10 15:27:08 +02:00
c38898f1a6 fix alignment of meter tick 2013-07-10 15:27:08 +02:00
f4557194ab meterbridge shift|ctrl reset [group] peaks 2013-07-10 15:27:08 +02:00
94fbfb9658 left/bottom align of labels in meterbridge 2013-07-10 15:27:08 +02:00
4726339f4c meter metrics tick rendering (offset by meter-border) 2013-07-10 15:27:08 +02:00
8574be424e meterbridge - change label size with height 2013-07-10 15:27:08 +02:00
42ee64e950 midi meter updates.. 2013-07-10 15:27:08 +02:00
4a3695d2de update midi meter colours 2013-07-10 15:27:08 +02:00
41b9b0783b clean up meterbridge peakindicator theme 2013-07-10 15:27:07 +02:00
503ef3ff3c update default meter colors 2013-07-10 15:27:07 +02:00
8a16e61b11 make all meter-colors configurable,.. 2013-07-10 15:27:07 +02:00
571b2d70e9 refactor level-meter widget: 5x2 stops meter colors 2013-07-10 15:27:07 +02:00
2e696812d5 keep meterbridge always on top 2013-07-10 15:27:07 +02:00
6b4e263d85 make meterbridge a normal window - border-colored overflow if maximized 2013-07-10 15:27:07 +02:00
b366945e07 reduce min meter height 2013-07-10 15:27:07 +02:00
55da1b1a3a adjust meterbridge label size 2013-07-10 15:27:07 +02:00
8e4cb45382 meterbridge rec-enable button image 2013-07-10 15:27:06 +02:00
abbb174df8 meterbridge -9dBFS tick -> red 2013-07-10 15:27:06 +02:00
71ee4d276f meterbridge track-name -> button 2013-07-10 15:27:06 +02:00
0276b1f69a ardour-button: allow to rotate text 2013-07-10 15:27:06 +02:00
50e5bcdb69 dedicated color-theme entry for peak-metrics 2013-07-10 15:27:06 +02:00
339b9dde94 remove meterbridge topmost tick. 2013-07-10 15:27:06 +02:00
6d69567676 fix track-header: show meters the first time 'round. 2013-07-10 15:27:06 +02:00
79b63b7d5e meterbridge: remove unused interface 2013-07-10 15:27:06 +02:00
aabe526df2 update track-header layout - proper padding around meters 2013-07-10 15:27:06 +02:00
95e163a466 rework meterbridge peak indicators (again) 2013-07-10 15:27:06 +02:00
b04ce87f79 refine meterbridge layout.. 2013-07-10 15:27:05 +02:00
95736d6652 add circle-ticks to the midi-metric area 2013-07-10 15:27:05 +02:00
be89982841 meterbridge: narrower ticks 2013-07-10 15:27:05 +02:00
929051ab99 meterbridge: update peak button size and tweak label position 2013-07-10 15:27:05 +02:00
6c3695e60e use narrow mono meter on narrow mixer-strips 2013-07-10 15:27:05 +02:00
e57a66fa31 meterbridge peak-indicator: button only 2013-07-10 15:27:05 +02:00
92c271b9d3 update default meter backround gradient colors 2013-07-10 15:27:05 +02:00
2d0309c092 experiment - no space in meterbridge. 2013-07-10 15:27:05 +02:00
a3f3f5e502 update meterbridge ticks & labels 2013-07-10 15:27:05 +02:00
2a534de272 double width of mono-meters in track-header 2013-07-10 15:27:04 +02:00
08167d6ac4 overhaul meterbridge metrics part one. 2013-07-10 15:27:04 +02:00
3c82b99a3b metrics test (should not be part of 1st meter) 2013-07-10 15:27:04 +02:00
52f31957de meterbridge ticks.. 2013-07-10 15:27:04 +02:00
97d3393c50 increase width of mono-meters in mixer 2013-07-10 15:27:04 +02:00
c7057c30d8 s/Window|Meter/Window|Meterbridge/ 2013-07-10 15:27:04 +02:00
3823ffc942 configurable meter background color 2013-07-10 15:27:04 +02:00
066b385c68 adjust padding of meters in time-axis view (still using border bg color) 2013-07-10 15:27:03 +02:00
363b646de9 add margin around meters in editor track header 2013-07-10 15:27:03 +02:00
cefca4c2b2 meterbridge label alignment & height 2013-07-10 15:27:03 +02:00
c24f582df8 meterbridge: honor DPI, Color & Theme changes 2013-07-10 15:27:03 +02:00
04ad452bca fix meterbridge window behaviour on session unload/close. 2013-07-10 15:27:03 +02:00
30ff4da054 disable all meterbridge metrics & ticks for now 2013-07-10 15:27:03 +02:00
cc2c6e8064 add peak-hold button (independent from mixer) 2013-07-10 15:27:03 +02:00
9bab5c919b meterbridge ticks/metric experiments.. 2013-07-10 15:27:02 +02:00
917e3522d0 meterbridge: add rec-enable btn & prepare metric/tick separation 2013-07-10 15:27:02 +02:00
c23a537b61 session property - include busses in meterbridge 2013-07-10 15:27:02 +02:00
bc2ff6a554 overhaul meterbridge:
* rotate labels, fix size
* identical total width for mono + stereo meters
* show metric area only every 8th meter
* ...
2013-07-10 15:27:02 +02:00
446aed52f3 allow to set level-meter min width 2013-07-10 15:27:02 +02:00
afa34d57a0 set window title of meterbridge window 2013-07-10 15:27:02 +02:00
b582112aeb meterbridge: fix initial and max window size. 2013-07-10 15:27:02 +02:00
a4373a99c6 meter-bridge details:
* sort routes
* draw metric area
* layout & style
2013-07-10 15:27:02 +02:00
35937e5083 implement meterbridge & meter-strip 2013-07-10 15:27:02 +02:00
b0998844db basic window infrastructure for meterbridge 2013-07-10 15:27:02 +02:00
3091b5f1ad fix possible crash when aborting a region drag and there are time axis views without streamviews 2013-07-09 09:45:54 -04:00
38f2aa51bd Merge branch 'master' into cairocanvas 2013-07-09 09:11:52 -04:00
07be5beee7 window delete/hide is managed by WMProxy (amend to cb6f16ac) 2013-07-07 22:29:45 +02:00
2b0fef5933 revert 3c6ff2f0 now that WM-proxy is session-aware..
also includes a few additional tweaks on top of the revert:
don't set sessions to windows managed by the WM::Manager,
and also call WM::Manager's set_session (s); when closing session.
2013-07-07 19:29:55 +02:00
a22e20133d make window-manager session-aware 2013-07-07 19:29:50 +02:00
cb6f16ac2d fix save/restore [plugin] window pos&size (without save) 2013-07-07 19:29:42 +02:00
3c6ff2f02f fix/workaround window-proxy session-management
The window proxy defers construction of classes.
set_session() is called before the instances are available.
the proxy-manager only calls set_session() for SessionHandlePtr
but not the class-specific method..

fixes http://tracker.ardour.org/view.php?id=5566
2013-07-07 04:18:23 +02:00
539e58bf5d possible fix for crash on exit - err on the side of caution 2013-07-07 04:17:04 +02:00
b28706852d fix race/endless loop on exit:
if gtk is going away while ardour updates the splash-screen:
Gtk-CRITICAL **: IA__gtk_main_quit: assertion `main_loops != NULL' failed
2013-07-04 21:32:41 +02:00
4fea31fd78 adjust mixer meter metric scale 2013-07-03 13:16:43 +02:00
da1e8701eb fix alignment of meters on midi-tracks 2013-07-03 04:52:02 +02:00
e642704c3a Make CD track details visible whenever CD range is ticked.
Make the CD track details visible whenever the CD range box has been
ticked, rather than only when the user toggles the box on.
2013-07-01 19:03:20 +01:00
37743ea9b1 minor fixes for recent cairocanvas work so that it builds on OS X (64bit) 2013-07-01 12:04:02 -04:00
5d6c986748 Merge branch 'master' into cairocanvas 2013-07-01 03:46:11 -04:00
6ff66a4081 common spelling of infinity (lowercase as libc's printf) 2013-06-30 18:54:53 +02:00
4fa8b87083 Fix 'Location window is blank' (#5538)
Call set_session() on the location window from ARDOUR_UI::set_session(),
and show_all() on the location window's LocationUI in set_session,
so that it displays the markers and ranges of the current session.
2013-06-30 14:32:30 +01:00
fb8db038f7 Fix crash when showing external send GUI 2013-06-29 17:19:49 +02:00
af3056769c changes to waveform clipping display
* clip level is now -0.9dbFS
   * display of clipping is optional (see Theme Manager window)
   * clipping is based on disk data, unscaled by region gain
2013-06-28 20:21:30 -04:00
7a7e937d8e more waveform drawing/coloring changes
* move color-regions-using-track color into UI config, not RC config
   * consolidate all waveform coloring into AudioRegionView::set_one_waveform_color()
2013-06-28 11:31:26 -04:00
645878db97 remove dead code (we have git) plus add a comment 2013-06-27 15:57:48 -04:00
6618c9e406 use HSV to pick random colors and avoid over-saturation or over-brightness 2013-06-27 15:51:57 -04:00
0e656f0a13 workaround/hack/fix for cairo pattern gradient space exceeding 2^16 size limit 2013-06-27 10:41:00 -04:00
24acef66be use W3C color difference computation to select black or white text for region name text 2013-06-26 17:40:10 -04:00
283e3ceb04 move marker text up by 2 pixels 2013-06-26 17:39:27 -04:00
d299e41a61 fix position of verbose cursor 2013-06-26 12:02:54 -04:00
8ee0671fd9 probable fix for a region drag that somehow ends up with no time axis view (track) under the mouse (e.g. during a track height reduction 2013-06-26 11:49:16 -04:00
3031a99364 Merge branch 'master' into cairocanvas 2013-06-25 22:24:47 -04:00
2b74c955f1 fix zoom focus issue that was messing up zoom changes 2013-06-25 21:56:10 -04:00
2108525187 fix up size and drawing of measure lines, even when vertically scrolled 2013-06-24 23:03:11 -04:00
a1f858d3b2 an awful lot of tweaks to drawing details 2013-06-24 16:28:53 -04:00
5c2f568102 fix ardvst and ardourvst (use variable or version number) 2013-06-23 18:59:47 +02:00
072e49d324 Merge branch 'radiosrb' of https://github.com/adiknoth/ardour 2013-06-23 18:05:05 +02:00
60e4598aec Merge branch 'patches' of https://github.com/jdekozak/ardour 2013-06-23 17:58:52 +02:00
2b9ee3b0f4 fix caching of Audio+Midi metrics
MIDI track meters can either be MIDI-only or Audio+MIDI
previously they used the same ID for gain-meter static
image cache.
2013-06-23 14:23:47 +02:00
Julien de Kozak
8af47234fb remove compilation warning 2013-06-23 13:37:50 +02:00
9a9f4276a0 Further Freesound import tweaks.
Make download of sound files multi-threaded. Each sound file download takes
place in its own thread, and has its own progress bar and cancel button,
which stack up from the bottom of the list of results.

Sound files download into a file with a '.part' suffix, which is then
renamed to the intended name on success.

Add a 'Similar' button, which searches Freesound for sounds similar to the
currently-selected sound in the results list.

Add a freesound-download-dir config variable to decide the location
of sound files downloaded from Freesound.

Move Windows-specific logic to replace '/'s with '\'s from
Mootcher::changeWorkingDir() to Mootcher::ensureWorkingDir(), and remove
the now unused Mootcher::changeWorkingDir().

Use Glib::build_filename to construct paths.
2013-06-22 13:35:03 +01:00
11becd4a6b properly restore newer (cairo-canvas related) UI config parameters 2013-06-21 17:15:56 -04:00
1b73ab2065 fixed const cast warning 2013-06-21 17:15:12 -04:00
ffbe9a949e fix unused argument warning 2013-06-21 17:14:53 -04:00
7ba817e36f Amend comment to 'delete this'
Amend comment to 'delete this' to describe why I think it's OK.
2013-06-21 21:33:56 +01:00
8ad4924b7f Use connect(..., gui_thread()) rather than g_idle_add().
Use the proper functions to ensure things happen in the main gui thread,
instead of fudging around with g_idle_add().
2013-06-21 21:30:52 +01:00
0483803186 Further Freesound tweaks.
Make download of sound files multi-threaded. Each sound file download takes
place in its own thread, and has its own progress bar and cancel button,
which stack up from the bottom of the list of results.
Sound files download into a file with a '.part' suffix, which is then
renamed to the intended name on success.
Add a 'Similar' button, which searches Freesound for sounds similar to the
currently-selected sound in the results list.
2013-06-21 21:30:52 +01:00
1eff5a8215 Use config variable for Freesound download folder location.
Use the new freesound-download-dir config variable to decide the location
of sound files downloaded from Freesound.
Move the Windows-specific logic to replace '/'s with '\'s from
Mootcher::changeWorkingDir() to Mootcher::ensureWorkingDir(), and remove
the now unused Mootcher::changeWorkingDir().
Use Glib::build_filename to construct the path.
2013-06-21 21:30:52 +01:00
daf4dd874a Add vertical zoom via scroll wheel modifier key to editor summary.
If the ScrollZoomVerticalModifier key is used with the scroll wheel over
the editor summary pane, zoom the editor vertically.
2013-06-21 21:28:13 +01:00
741f9de3f7 Make scroll-wheel modifier keys consistent in editor summary pane.
Separate out the handling of left/right scroll events from normal up/down
ones in the editor summary pane scroll wheel handling, and use the new
constants for scroll wheel keyboard modifiers in conjunction with up/down
scroll events. Modifiers for left/right scroll events should be unaffected
by this.
2013-06-21 20:44:40 +01:00
479e97dc59 some prep work for generally handling dbl-click on draggable objects 2013-06-21 15:18:54 -04:00
21914c884e Make scroll-wheel modifier keys consistent in main editor window.
Add constants for the keyboard modifiers that should be used for vertical
zoom, horizontal zoom, and horizontal scrolling in the main editor window,
and use these where appropriate rather than using Keyboard::PrimaryModifier
and friends directly.
2013-06-21 20:13:44 +01:00
1c74a3ab2d waveform drawing improvements
* handle logscaled and rectified
    * put dark tips in right places
    * improve color selection algorithm
2013-06-21 13:17:37 -04:00
594a8c1221 set waveform color to a V-reduced version of the frame fill color. 2013-06-20 23:11:40 -04:00
e6e5aab812 move video export info to online-manual, allow to open it. 2013-06-19 20:26:53 +02:00
Adrian Knoth
db7bd7ca58 Prompt the user for confirmation before removing an export preset
Requested by Radio SRB (http://srb.fm)
2013-06-19 19:05:46 +02:00
Adrian Knoth
9334914137 Prompt the user for confirmation before removing an export format.
Requested by Radio SRB (http://srb.fm)
2013-06-19 18:52:06 +02:00
aaaeb958c1 switch samples_per_pixel to integer type 2013-06-18 23:02:54 -04:00
a0c5de281a fix crash when recording, because the audioregion view has no frame handles 2013-06-18 08:22:25 -04:00
b407b753f7 vtl: remember original video-file for later export/mux 2013-06-17 09:46:01 +02:00
1c24a847dd remove no-op "horizontal_position_changed()" method from StreamView and RouteTimeAxisView 2013-06-16 22:15:32 -04:00
cc960c4f07 remove executable mode-bit from files 2013-06-16 21:54:08 +02:00
e3db97efe9 vtl: use avi/mjpeg (insted of mpeg4) for video proxy
* average picture quality is worse
 * ..but seeking works accurately
   (no more PTS/DTS mess with Quicktime files)
 * ffmpeg transcode to mpeg4 retains PTS, DTS ( to mjpeg does not)
 * eventually harvid&xjadeo need to be
   updated to seek to non-monotonic PTS, DTS timestamps
2013-06-16 17:04:00 +02:00
24af570d06 vtl: update ffmpeg option sameq/qscale 2013-06-16 15:30:15 +02:00
d3f92cd1fb new track-height icons -- inspired by tom^_ 2013-06-15 00:01:03 +02:00
11619a37bf Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/imageframe_time_axis.cc
	gtk2_ardour/imageframe_time_axis.h
	gtk2_ardour/imageframe_time_axis_group.cc
	gtk2_ardour/imageframe_time_axis_group.h
	gtk2_ardour/imageframe_time_axis_view.cc
	gtk2_ardour/imageframe_time_axis_view.h
	gtk2_ardour/imageframe_view.cc
	gtk2_ardour/imageframe_view.h
	gtk2_ardour/marker_time_axis.cc
	gtk2_ardour/marker_time_axis.h
	gtk2_ardour/marker_time_axis_view.cc
	gtk2_ardour/marker_time_axis_view.h
	gtk2_ardour/marker_view.cc
	gtk2_ardour/marker_view.h
	gtk2_ardour/video_image_frame.cc
	gtk2_ardour/visual_time_axis.cc
	gtk2_ardour/visual_time_axis.h
	libs/canvas/canvas/circle.h
2013-06-14 21:09:24 +02:00
cd04861f37 remove cruft 2013-06-14 17:29:14 +02:00
b44060ce96 remove old/unused export_multiplicator 2013-06-14 17:28:46 +02:00
084af4727d remove cruft - old CMT imageframe* 2013-06-14 17:18:59 +02:00
46b6987311 fix merge of master
frames => samples rename in cairocanvas branch caused minor breakage
2013-06-14 10:50:40 -04:00
006e3575be NOOP clean up code
move curl-http-get wrapper-function which is used by various
videotimeline related code to util.c
2013-06-14 13:58:56 +02:00
748de7e794 avoid name-conflict
when compiled with -rdynamic, "AudioStream" symbol
conflicts with AspectVST.so
2013-06-14 13:58:55 +02:00
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
80a13145f3 Generalize no-plugin-state from AudioUnits to all plugins
Replace AU_STATE_SUPPORT compile-time define with NO_PLUGIN_STATE and make it prevent plugin state setting, preset loading, preset saving and plugin state saving. Blocks on these actions exist partially in the backend and partially in the GUI (this latter class are not absolute, and should OSC or MIDI be able to drive Plugin::save_preset() the block could be circumvented). Set NO_PLUGIN_STATE if --freebie is used at waf-configure time
2013-06-13 22:50:54 -04:00
5d52ae1825 Update Russian translation of Ardour 3.2 2013-06-14 02:21:02 +02:00
2b90a57655 Fix the spelling and abstract the program name
The video exporting dialog has a few spelling bugs, as well
as unabstracted program name. The patch fixes it.
2013-06-14 02:10:31 +02:00
d7e336e0f2 s/Framenumber/Frame number/ 2013-06-14 00:41:02 +02:00
489121ca20 vtl: clean-up "Remove Video" action state 2013-06-13 17:17:28 +02:00
27e2b09f63 vtl: check if server's docroot matches ardour's config
NOTE: this breaks backwards compatibility with icsd and
harvid < 0.3.0 which do not report their settings.

It may also conflict with harvid running on localhost in a chroot.

Ideally this will be a warning only.
That the user can choose to ignore this and should get the option
to stop the video-server and re-start it using a different docroot.
2013-06-13 00:58:19 +02:00
6b480bb2f7 vtl: make "Remove Video" insensitive if N/A 2013-06-13 00:58:19 +02:00
2e1e5da78e more changes to consolidate version definition into the top level wscript file 2013-06-11 11:37:52 -04:00
ef6366a7cd adjust the way version and revision info are gathered, defined and used 2013-06-11 10:58:24 -04:00
31e8c77609 update .po files 2013-06-11 08:49:52 -04:00
21a4ce62dc vtl: wait for output from ffprobe
fix code-ordering bug that sneaked in when re-factoring the parser.
2013-06-11 02:58:10 +02:00
1ca430babd separate general vs temporary(no vtl) OSX defines 2013-06-11 01:26:49 +02:00
9b9ebee02c remove inadvertently committed debug message 2013-06-11 00:49:36 +02:00