13
0
Commit Graph

6409 Commits

Author SHA1 Message Date
ce7bfb489c change "cpu" in cpu load backend functions 2013-12-04 11:48:31 -05:00
b2bc7cfbe1 change "cpu" in cpu load backend functions 2013-12-04 11:45:53 -05:00
d7206b7830 fix gtk child packing errors related to the transport bar meter box/peak display 2013-12-03 19:45:34 -05:00
8648a8a13b fix up wscript/build issues in exportvis after merge with master 2013-12-03 11:51:25 -05:00
69df7763a1 switch from using Sleep/usleep to Glib::usleep() (and remember that we need to make Glib::usleep() actually work on windows one day) 2013-12-03 10:24:34 -05:00
c3c9960427 fix build 2013-11-30 11:17:42 -05:00
3c98de9ce4 fix merge with master 2013-11-29 22:31:29 -05:00
15cee60021 merge and resolve conflict with master 2013-11-29 22:29:25 -05:00
074b0c4dca add explicit linkage to libtimecode 2013-11-29 22:24:37 -05:00
4c0a274b43 do not push new state to backend from audio/MIDI setup until OK or Apply are clicked (i.e. do not do this when device is changed) 2013-11-27 17:41:22 -05:00
efff843f05 Merge branch 'master' into windows 2013-11-26 10:25:55 -05:00
08371ae2cf resolve merge with master (?) 2013-11-26 10:24:51 -05:00
fa22520fd2 Merge branch 'master' into cairocanvas 2013-11-25 09:26:35 -05:00
Sakari Bergen
f1db14923e Hande export initialization exceptions gracefully 2013-11-23 19:11:31 +02:00
af9ac37b60 fix for toolbar master-meter w/o master bus and/or detached toolbar 2013-11-23 16:48:26 +01:00
5cbd4ce759 fix crash @ session-restore of plugins windows
The question is: why is _owner not set [yet], when the
window is restored. This rather smells like a race condition.
2013-11-22 18:22:55 +01:00
9a50b56930 reset time-axis peak when meter-point changes - fixes #5771 2013-11-20 18:54:34 +01:00
c1e8da2e60 Distinguish Save-as and Snapshot dialog window 2013-11-19 15:51:27 +01:00
2da67fb99f fix audio-clock sample entry, handle empty entry as NOOP 2013-11-11 02:33:57 +01:00
982c38dda1 allow to include In/Disk button on Meterbridge 2013-11-09 13:16:08 +01:00
8c2cc85e8f really no reason to support ARDOUR_EN anymore ... we have a preference dialog item to enable/disable translation 2013-11-05 14:20:03 -05:00
0392e1c9a4 on OS X 10.7 at least, LANG is set by the system, so do not bail out of language stuff early just because it is set 2013-11-05 13:43:25 -05:00
3ce39cc410 update .po files with --no-fuzzy-matching in use 2013-11-05 11:15:46 -05:00
0cca272431 try to fix various warnings from gcc when optimization flags are enabled 2013-11-04 21:32:41 -05:00
c01e37171e keep processing LV2 Ringbuffer once it is allocated
Discard messages in LV2PluginUI::write_to_ui() if the
ringbuffer exists but the UI is not active.

This fixes "[ERROR]: Error writing from plugin to UI" messages
if the UI was once active but has been closed since.

This is a hotfix solution, eventually the LV2 backend should be updated
and a function LV2Plugin::disable_ui_emmission() implemented.
2013-11-05 02:06:20 +01:00
08b485db75 send enter events to EVERY newly entered item (ignore the bool return from the event handler); other canvas debugging aids;switch items_at_point() to use canvas coordinates 2013-11-03 10:07:00 -05:00
85daa31ab5 all events propagate out of the canvas in canvas coordinates now, so revert changes in editor_drags.cc that worked around this not being the case 2013-10-31 16:43:35 -04:00
ba26316857 make region fade in/out curve shapes into PolyLines not Polygons so that they don't close the stroke path at the top/bottom 2013-10-31 15:39:29 -04:00
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04:00
b80ae88154 fix window/canvas coordinate confusion in drag code, apparently fixing up lots of things with just 1 line 2013-10-31 12:41:02 -04:00
ff560fa361 remove debug output 2013-10-31 11:48:36 -04:00
7ce86cec7d handle enter/leave items when zooming and scrolling occur 2013-10-31 03:10:18 -04:00
7bbd28aa08 notable changes to try to improve most of enter/leave handling for canvas items 2013-10-30 23:36:30 -04:00
nick_m
f2300164d7 Fix thinko in setting order hint. 2013-10-29 02:04:26 +11:00
Nils Philippsen
5f00d2f3a7 allow linking unbundled versions of some libraries
(libltc, rubberband, taglib, vamp-sdk)
2013-10-28 09:06:09 +01:00
Nils Philippsen
85fd343145 gtk2_ardour: link fftw3f directly
This is needed to be able to unbundle some libraries.
2013-10-28 09:06:09 +01:00
1c2de76991 give those who insist on seeing the mixer window and/or editor mixer on stupidly small screens the chance to do so 2013-10-27 20:55:06 -04:00
5eaafaa3af further fixes for NSM-based startup
Most, move initialization of Audio/MIDI setup window before NSM initialization, to make sure it is available if/when needed
2013-10-27 20:48:48 -04:00
632f5d5231 add error checking and return from attempted NSM-based initialization 2013-10-27 20:32:56 -04:00
f52cfdd639 Fix french translation of "meterbridge" -- closes #5744 2013-10-26 12:29:28 +02:00
b00751d0dc fix up ordering/timing of naming for TimeAxisViewItem (so that canvas debugging is more useful) 2013-10-25 13:30:01 -04:00
8c26a2fab0 Don't allow loop, punch, or session range markers to be renamed.
Don't allow loop, punch, or session range markers to be renamed, even when
double-clicked.
2013-10-25 17:03:45 +01:00
e7875954ca Edit tempo & meter markers on double-click. 2013-10-25 17:03:45 +01:00
efd2e1776d Double-click on region pops up region properties. 2013-10-25 17:03:45 +01:00
db0f2aad48 Mark session dirty when a marker is renamed. 2013-10-25 17:03:45 +01:00
abb05680b4 Make double-click on marker pop up rename dialogue. 2013-10-25 17:03:45 +01:00
89193dc40b Add a double-click handler for items in the editor window. 2013-10-25 17:03:45 +01:00
nick_m
e80d66c908 Use add_route_dialog's transient_for() window to determine track selection for order_hint. 2013-10-26 02:37:45 +11:00
3a5e98bb8b redraw entire MidiStreamView after scroomer drag so that everything is redrawn 2013-10-24 17:55:25 -04:00
14e5d4c26c remove unnecessary initialization of fill color for streamview rect 2013-10-24 17:11:29 -04:00
30394cdcf9 fix placement of black/white note lines/bars in MIDI streamview 2013-10-24 17:11:07 -04:00
4316eda89f remove fuzzy and obsolete translations 2013-10-23 20:01:23 +02:00
4f9e46976c make middle-click on piano roll track header more usefully select/unselect notes 2013-10-23 10:38:50 -04:00
fca33f903d fix up drawing of MIDI note "lines" on track canvas, which were in the wrong places 2013-10-23 10:38:09 -04:00
nick_m
be69bf15dd New routes are placed after highest selected route. 2013-10-24 01:27:13 +11:00
d135c4dc3a fix merge conflicts with master 2013-10-23 08:47:57 -04:00
98f53d11b3 fix midi quantization - part one
subtract offset if region was truncated at the beginning.
2013-10-23 01:25:46 +02:00
664e715a00 merge from master 2013-10-22 15:29:44 -04:00
3f15584749 Merge branch 'unify_display_ordering' of https://github.com/nmains/ardour 2013-10-22 14:33:21 -04:00
ed42f3359b Merge branch 'miscfix' of https://github.com/mojofunk/ardour 2013-10-22 14:32:57 -04:00
0029ee40b6 honor LV2 units:midiNote: display Note name instead of integer 2013-10-22 17:28:49 +02:00
17cd6b4044 fix locale path in OS X bundles 2013-10-22 11:08:31 -04:00
f1a6735ca4 use new default SR + bufsize values in engine dialog 2013-10-21 11:40:46 -04:00
28525d7b69 Forward declare NSM_Client class in ardour_ui.h
nsm.h pulls in winsock2.h and with the mingw build and it causes endless
warnings from the compiler
2013-10-21 10:10:40 +10:00
b540d0e4bc Fix check button handling in Memory Warning Dialog 2013-10-21 10:10:40 +10:00
53bf1a65e8 Fix two minor memory leaks in pending state dialog 2013-10-21 10:10:40 +10:00
nick_m
5b62e88fbf Unify editor / mixer ordering. 2013-10-21 00:19:43 +11:00
f86599cd74 fix bad merge that brought OSC headers back into gtk2_ardour 2013-10-20 09:04:48 -04:00
58eaab0e42 fix compilation 2013-10-20 09:04:27 -04:00
f191bdf6a0 replace rather than append to SUIL_MODULE_DIR
should fix http://tracker.ardour.org/view.php?id=5679
2013-10-19 18:16:34 +02:00
f85c67501c reverse the visibility.h files assumptions that we don't build shared libs by default
This avoids having to define define LIBFOO_DLL=1 all over the place. If we ever go with static libs we will
need to define LIBFOO_STATIC=1 but hopefully in some central location like the top level wscript.

Oh, and I also dropped support for gcc older than version 4.x because ardour will already not build
on such an old version.
2013-10-18 11:50:44 -04:00
683496c501 use libltc and libtimecode as static libs, and upgrade to waf 1.7
This is slightly awkward. It is important that we only link once to the static lib. Doing this at executable link time did not
work, possibly because waf insisted on putting the two static libraries at the front of the link list. So instead libardour
is now the point where linkage to these libraries occurs (and nowhere else). This should never be changed unless the change
just moves the linkage point to another location.

Also fix a bug with the libardour version tha was picked up by waf 1.7
2013-10-18 11:11:59 -04:00
b855e5f322 Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/wscript
	libs/ardour/ardour/audioregion.h
	libs/ardour/ardour/debug.h
	libs/ardour/ardour/directory_names.h
	libs/ardour/ardour/filesystem_paths.h
	libs/ardour/ardour/session_event.h
	libs/gtkmm2ext/gtkmm2ext/utils.h
	libs/panners/1in2out/wscript
	libs/panners/2in2out/wscript
	libs/panners/vbap/wscript
	libs/pbd/pbd/debug.h
	libs/pbd/pbd/file_utils.h
	libs/pbd/pbd/pathexpand.h
	libs/pbd/pbd/ringbuffer.h
	libs/pbd/pbd/ringbufferNPT.h
	libs/pbd/pbd/search_path.h
	libs/pbd/pbd/stacktrace.h
	libs/pbd/pbd/uuid.h
	libs/pbd/pbd/uuid_boost.h
	libs/surfaces/control_protocol/control_protocol/basic_ui.h
	libs/surfaces/control_protocol/control_protocol/control_protocol.h
2013-10-18 10:03:22 +01:00
f3d2ca0d9a get everything compiling with libardour built using -fvisibility=hidden 2013-10-17 12:41:28 -04:00
94ef2692b8 add export control to libevoral 2013-10-17 10:52:02 -04:00
e89f129e5e add defines to gtk ardour build so that it knows that our internal libs are all shared 2013-10-17 08:47:43 -04:00
e5888d3983 merge with master and fix 2 conflicts 2013-10-16 22:06:56 -04:00
fb313fb174 Merge branch 'master' into windows 2013-10-16 21:57:17 -04:00
75b933eadb Merge remote-tracking branch 'remotes/origin/master' into windows+cc 2013-10-16 15:55:59 +01:00
cb3abec966 fix typo from earlier change to conditionalize driver-change in audio backend 2013-10-15 22:05:10 -04:00
cf808c3e1c another russian translation update 2013-10-15 15:32:50 -04:00
4404a38996 prevent button in latency measurement dialog from changing size when relabelled 2013-10-15 14:55:54 -04:00
56fa4d9045 update russian translation (again) 2013-10-15 14:03:59 -04:00
001fc1f55b fix spelling and program name abstraction 2013-10-15 14:03:41 -04:00
019cd26ba4 update russian translation (from alexandre prokoudine) 2013-10-15 13:18:13 -04:00
6e0a3c4853 try to prevent crash if running latency calibration with JACK setup that is lacking input or output ports (re: #5721 and #5719) 2013-10-15 13:15:03 -04:00
df13a8c0b1 fix crash when opening audio/MIDI setup while playing etc. 2013-10-15 12:48:58 -04:00
97c68cc2b1 Merge branch 'windows' into windows+cc
Conflicts (hopefully resolved):
	libs/pbd/stacktrace.cc
2013-10-15 17:38:08 +01:00
fa03eee79e make the startup -> session dialog flow more sensible for brand new users 2013-10-15 12:37:13 -04:00
69a8fc43e2 Merge branch 'master' into windows 2013-10-15 11:17:12 -04:00
fb1eefdd5e do not call AudioEngine::set_driver() when the backend does not require driver selection 2013-10-15 11:08:51 -04:00
e466ce40ad Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
2013-10-14 19:31:22 +01:00
98880915af 'gtk2_ardour' - Add some further header files to satisfy MSVC build 2013-10-14 17:14:23 +01:00
404fb92533 'gtk2_ardour' - Harmonize usage of 'COMPILER_MINGW' and 'COMPILER_MSVC' where appropriate 2013-10-14 17:07:45 +01:00
8a4a86eff4 'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead 2013-10-14 17:05:42 +01:00
5568026387 'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead 2013-10-14 17:00:28 +01:00
a901f28c62 use processor owner to set GUIs opened by a ProcessorBox, not current route name
Since the GUIs remain open across changes in track selection for the editor mixer now, the current route name
is not always correct as the owner/location of the Processor.
2013-10-14 11:14:38 -04:00
a244075fb3 changes that will help fix a crash related to plugin window visibility. some work still to be done 2013-10-14 09:54:38 -04:00
09c7c5fb95 tweak API of WindowProxy, and remove all unnecessary get() calls in functions where, if we have no window, there is nothing to do 2013-10-14 09:54:38 -04:00
44b359b70a enable videotimeline on OSX 2013-10-12 23:04:37 +02:00
c2b2953f8c export video-range: add to context menu 2013-10-12 22:56:08 +02:00
f7c54f1435 video-range export tweaks:
* quantize range to video-frame boundaries
* warn if range is empty or does not include video
2013-10-12 22:56:08 +02:00
a90858897e do not use delete_when_idle() to delete a plugin UI because an entirely separate mechanism exists for that 2013-10-12 16:44:50 -04:00
37522a2f5e revert part of 4091ff175c that caused window/sizing chaos. silly paul 2013-10-12 15:37:55 -04:00
e0a3c3f4fa rework things for Audio/MIDI setup dialog a bit: no tabs being the most noticeable change 2013-10-12 14:57:32 -04:00
4091ff175c 1 bug fix plus padding control for ArdourButton 2013-10-12 14:56:57 -04:00
be8d06f848 post a dialog about a session being opened in read-only mode (if it happens) 2013-10-12 11:58:22 -04:00
949a0d2934 minor adjustments to latency measurement UI stuff 2013-10-12 10:04:20 -04:00
b688dc802f remove erroneous ` in string 2013-10-12 09:59:33 -04:00
57262331c1 don't use a possibly non-existent window as a transient parent when showing a dialog about engine failure 2013-10-11 15:58:51 -04:00
fa71d82dda Merge branch 'windows' into windows+cc 2013-10-11 18:23:53 +01:00
a38c0efbe7 minor tweaks to audio/MIDI setup window 2013-10-10 21:07:17 -04:00
b194c1ad88 more fixes and rationalizations for MIDI option handling in the audio MIDI setup 2013-10-10 16:18:27 -04:00
645e9caeee basic use of new backend MIDI options 2013-10-10 12:59:33 -04:00
c4b20f1a20 nicely handle the (should-never-happen) case of no audio/MIDI backends being detected 2013-10-10 11:24:16 -04:00
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
c94f0b6298 updated DE translation from edgar aichinger 2013-10-08 12:22:49 -04:00
19ba3b8de7 fix some issues with window flow when session loading fails; shrink "New Session" button in session setup dialog 2013-10-08 12:18:27 -04:00
22eea8e9e2 possible relief for snapshot loading 2013-10-07 20:46:10 -04:00
2230dc92cd remove debug output 2013-10-07 20:30:28 -04:00
c727d18b80 delete the UI from main() to get full cleanup 2013-10-07 20:28:20 -04:00
5d85b5257e use new GtkUI design in ARDOUR_UI 2013-10-07 20:27:54 -04:00
7ac849689d window proxy should delete its window during its destructor 2013-10-07 20:17:49 -04:00
d74255343e fix up some aspects of loading from a cmdline session name 2013-10-06 16:32:02 -04:00
300b484cf6 Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
	gtk2_ardour/ardour_ui.h
	gtk2_ardour/ardour_ui_options.cc
2013-10-06 11:56:03 +01:00
df2b5c90e4 'gtk2_ardour' - In 'Note' c'tor, don't try to set 'rectangle->name' unless 'CANVAS_DEBUG' is defined 2013-10-06 11:00:10 +01:00
e93c425d6f 'gtk2_ardour' - One further Glib::usleep needed 2013-10-06 10:52:41 +01:00
7f4ed54f53 'gtk2_ardour' - Some further casting 2013-10-06 10:50:45 +01:00
449f600c69 remove another unnecessary use of libgen.h 2013-10-04 13:02:41 -04:00
ddcb78f3e2 use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least), part 2 2013-10-04 13:00:59 -04:00
028cd5660f use g_strcasecmp() instead of strcasecmp() which doesn't exist with MSVC (some versions, at least) 2013-10-04 12:50:03 -04:00
1344014cbd switch from MAXPATHLEN to PATH_MAX, and use <limits.h> not <sys/param.h> for portability 2013-10-04 12:46:31 -04:00
6daa7c1bc3 remove unnecessary header include 2013-10-04 12:46:02 -04:00
74f3955682 remove OSC related cruft from ardour_ui_options.cc
control surface activation is handled via an entirely separate mechanism now
2013-10-04 11:46:50 -04:00
da628185b1 'gtk2_ardour' - Make sure that 'getpid()' can be found when building with MSVC 2013-10-03 09:57:25 +01:00
5da78cea9a 'gtk2_ardour' - Use 'const_iterator' where appropriate, instead of 'iterator' 2013-10-03 09:52:39 +01:00
bc2b2f9e35 'gtk2_ardour' - Try 'lrintf' instead of 'rintf' which isn't available in MSVC 2013-10-03 09:50:34 +01:00
904367748c 'gtk2_ardour' - 'std::isinf' + 'std::isnan' are not available in MSVC (at least, not VC8) 2013-10-03 09:48:19 +01:00
f763e370c5 'gtk2_ardour' - When building with MSVC, use 'std::min' + 'std::max' rather than 'fmin' + 'fmax' 2013-10-03 09:43:55 +01:00
a19afc5903 'gtk2_ardour' - Specify 'Glib::usleep' where needed (global ::usleep is not available for MSVC) 2013-10-03 09:34:52 +01:00
8bf59e88e5 'gtk2_ardour' - Use 'floor / floorf' instead of 'trunc / truncf' 2013-10-03 09:32:08 +01:00
bb062f2b90 'gtk2_ardour' - Use 'GStatBuf' instead of 'struct stat' 2013-10-03 09:27:40 +01:00
d7a16f7de6 'gtk2_ardour' - Use 'std::vector' to implement an array whose size is unknown (required to be buildable with MSVC) 2013-10-03 09:12:02 +01:00
f8574fc39d 'gtk2_ardour' - Add namespaces + casting where necessary + general bits of 'correctness' to keep MSVC happy 2013-10-03 09:06:56 +01:00
d382925fba Add a header file guard (to prevent multiple #inclusion) 2013-09-26 15:17:40 +01:00
d614dc1e18 Deliberately specify 'Gtk::manage' where necessary (avoids creating ambiguities when we #include this header file elsewhere) 2013-09-26 11:47:17 +01:00
4f4a53e870 A further change which needs to be tested on the other compilers
(splitting a long string into 2 x concatenated strings)
2013-09-26 11:01:15 +01:00
a88f38cf10 'gtk2_ardour (msvc)' - Some changes needed before anything at all will compile
For the most part, the compilation problems are caused by lines such as:-

      WM::Proxy<ThemeManager> theme_manager;

Before MSVC will compile the above it needs to know that the specified object type contains an appropriate (i.e. publicly available) default c'tor. Therefore the corresponding header file needs to get #included, rather than just declaring that type to be a class (whilst all classes have a default c'tor, it needn't necessarily be public). The remaining changes are mostly minor.

This commit should be tested ASAP to make sure it doesn't upset the other compilers.
2013-09-26 10:58:07 +01:00
d0b67dce80 fix crash when cmdline provides session name 2013-09-24 22:22:16 -04:00
2c9644320f tighten up layout of session dialog; make button say cancel or quit in difference scenarios 2013-09-23 23:13:07 -04:00
f7b6a27de6 shrink small-splash.png image by 50% 2013-09-23 23:12:42 -04:00
0f6ba422f6 use new Session API to show session SR and disk bit depth in recent sessions list 2013-09-23 21:36:13 -04:00
cff174b541 move rate_as_string() from EngineControl to utils.cc 2013-09-23 21:35:17 -04:00
884789bfad move announcements frame around in the session dialog and adjust spacing/borders 2013-09-23 16:49:24 -04:00
b362ff220c major rearrangement of startup/session loading code
first-time user code remains in ArdourStartup
session selection/setup moved to SessionDialog
many other cleanups, logic improvements, and so forth to the overall session loading process.
Not 100% finished yet.
2013-09-23 14:41:52 -04:00
f1aa5839c0 use WindowManager/WMProxy to correctly manage the audio/MIDI setup window 2013-09-22 19:22:56 -04:00
20f28c82ec make session creation from a template work again 2013-09-22 11:19:34 -04:00
04d66a9e3a remove use-session-as-template option from new session dialog and fix ability to not use a template
Note: using a template is still not actually working ...
2013-09-21 13:56:59 -04:00
e33b29d672 make sure the template selector has an item visible if there are any 2013-09-21 13:22:06 -04:00
482a90cccf apply same always-check-display to recent sessions scroller in new session dialog
It turns out that we always create a new ArdourStartup right now, so this and the previous commit
are not actually necessary, but they do pave the way for keeping the dialog around instead
2013-09-21 13:14:33 -04:00
2577bf55c9 reset the visibility of the template selector stuff every time the startup/NSD gets mapped, so that it is always current 2013-09-21 12:51:30 -04:00
19bb2b33a8 Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
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-09-21 09:17:25 +01:00
461f94a3a1 if new session button clicked, clear any selection in recent sessions and mark browser unused 2013-09-20 16:45:04 -04:00
53bd17d938 move advanced new session options into an expander, change some wording 2013-09-20 16:05:54 -04:00
bab9184f7c changes to integrate new/recent/browse in new session dialog.
Probably some errors/mistakes in here and no doubt some improvements to be done.
2013-09-20 14:17:59 -04:00
960a47330a switch from JACK_Slave to Engine_Slave 2013-09-19 17:34:23 -04:00
d2ca0665bf reallow changing bufsize AND sample rate when we are in control, because this is cool 2013-09-19 16:48:05 -04:00
3f56abe099 missing initialization 2013-09-19 16:17:47 -04:00
57d24608e7 show a different audio/MIDI option screen if JACK is already running. try to fix problem with using AudioBackend::<property-value>() functions before anything has been set. 2013-09-19 15:03:20 -04:00
20fa19e69e more excision of "JACK" from labels, menu items, etc.
NOTE: users will lose the sample rate/latency display in the status bar display. Not yet sure what to do about this
2013-09-17 22:25:21 -04:00
fd23ebd088 Merge branch 'master' into cairocanvas 2013-09-17 21:23:30 -04:00
302b08c059 Merge branch 'master' into windows 2013-09-17 21:22:56 -04:00
402d92889a minor code changes 2013-09-17 21:22:22 -04:00
f51537b71d substantive changes to allow the audio/MIDI setup dialog to change settings as intended
So far only tested with JACK backend, but expected to be more correct for other backends too
2013-09-17 21:09:13 -04:00
7eda429155 remove JACK related action definitions (audio/MIDI setup is where this happens now) 2013-09-17 21:07:44 -04:00
c698ada035 change return type on {disconnect_from,reconnect_to}_engine() and make public so that we can use these when doing intentional disconnects without popping up the "HALTED" dialog 2013-09-17 21:07:14 -04:00
b7c15bc9fd remove JACK related menu items (audio/MIDI setup is where this happens now) 2013-09-17 21:06:15 -04:00
7381390565 add basic display of existing MIDI ports to audio/MIDI setup 2013-09-17 10:01:24 -04:00
1740bbb966 correctly restore zoom focus state after restart (from nick mainsbridge) 2013-09-16 22:32:55 -04:00
5e0e41e068 Merge branch 'master' into cairocanvas 2013-09-16 22:11:50 -04:00
fb45fdc052 fix conflicts and merge with master 2013-09-16 22:11:06 -04:00
c8b32e2f8b minor fixups for audio/MIDI setup spin buttons (now editable, as they should be) 2013-09-16 22:03:59 -04:00
61b98d3e9f check for an existing PublicEditor instance AFTER attempting to handle a key press in a window that has called relay_key_press(), so that normal key handling works there (e.g. audio/MIDI setup) 2013-09-16 22:03:27 -04:00
cb31e34a5c end latency detection if AMS window closed while running detection (plus some non-functioning changes to try to get spinbutton text entry to work 2013-09-16 18:47:30 -04:00
2a3dfb5e82 various bits of polish for the latency tab of audio/midi setup dialog 2013-09-16 15:21:32 -04:00
ed61a9ebbd update buffer size duration (msecs) while displaying saved audio/MIDI setup state 2013-09-16 11:10:05 -04:00
4d503c2053 commit some logic problems with the EngineDialog when change the driver/device name combos 2013-09-16 10:18:25 -04:00
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
4861eca974 Merge branch 'master' into windows 2013-09-13 11:55:56 -04:00
ccc81f05be remove some debug output messages 2013-09-12 17:25:01 -04:00
8432f78346 vtl: export selected range 2013-09-12 22:46:11 +02:00
026a30a3b4 tweak narrow-mixer-strip meters: nettings vs the_CLA. Round 3. 2013-09-12 22:46:00 +02:00
7c88670680 lots of changes to auto-start (and stop) the backend for latency measurements, and continuing work on the session construction/engine configuration flow 2013-09-12 16:28:51 -04:00
9a884535c3 prevent key press in pre-main-window dialog(s) from crashing the program because there is no editor window to forward key presses to 2013-09-12 14:39:17 -04:00
6b3907d57f change names, add comment, improve return type to avoid extra call to get EngineControl::State* 2013-09-12 12:26:59 -04:00
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
91e2eab01a make use of measured latency values to set dialog controls, and use actual port latency to compute extra delay 2013-09-11 13:02:32 -04:00
bede012727 remove unused members and code from EngineControl dialog (related to different devices for input+output) 2013-09-11 12:05:51 -04:00
d305dc1e0c more tweaks to latency measurement
don't open ports till absolutely necessary (store names for future use).

tidy up parts of the dialog (tab)
2013-09-10 23:25:15 -04:00
676ff80697 basic functionality for hardware latency measurement 2013-09-10 22:58:33 -04:00
209e4bdcae many changes relating to session construction and audioengine interaction
every session member is now initialized using C++ constructor syntax

session construction reordered to clarify the split(s) between work
where the engine is not relevant and work where is it is. this
split is still not 100% obvious, but is enormously clearer than
previously.

if engine/backend are not running as session is created, and the SR
of the sample rate is known, attempt to force backend to that value.
2013-09-10 15:41:19 -04:00
2a89234027 move control app launching back into audio backend to allow ASIO/CoreAudio model to work; push initial state of AMS dialog to backend
Issues remain with the basic model of the AMS dialog - when is
newly chosen state pushed into the backend (which can then
modify the control app button sensitivity. This is a special
problem for this button because APIs like ASIO and CoreAudio
probably don't allow us to launch a control app for an arbitrary
device, but only one actually in use. In this sense it is
different from properties like available buffer size etc, where
we can typically query without actually using the device.
2013-09-09 21:23:12 -04:00
29c9d94dbe fix control app breakage 2013-09-09 18:06:44 -04:00
3633892eaa fix crash when unconditionally using null env var; tweak packing of control app button 2013-09-09 17:10:58 -04:00
ecfeeda4b8 launching control app is now responsibility of ardour GUI, not audio backend; use ARDOUR_DEVICE_CONTROL_APP if set in the environment 2013-09-09 16:48:27 -04:00
f06187735d initial work on adding access to h/w control apps when ardour starts JACK 2013-09-09 15:17:43 -04:00
56465fda10 move engine dialog from a widget to an actual dialog; emit Session::AudioEngineSetupRequired when loading a session if it is necessary 2013-09-09 15:17:42 -04:00
cd6a9cfe38 hide tick-marks on narrow mixer-meters 2013-09-09 19:33:30 +02:00
93b3433de2 widen narrow mixer-meters,hide metric display instead 2013-09-09 18:31:50 +02:00
79b8a3c736 meterbridge: don't display metrics of invisible tracks 2013-09-09 17:32:33 +02:00
25cd52b392 vtl: update to ffmpeg v1.2.1 [lib]x264 option. 2013-09-08 18:27:41 +02:00
f4cf283f26 move JACK audio backend to its own folder and adjust build system to reflect that (installed version may now work) 2013-09-07 11:03:57 -04:00
e435f22793 add input/output channel counts and reorganize table somewhat 2013-09-06 21:00:01 -04:00
0467231d6e save/restore I/O latency values in audio/midi setup 2013-09-06 16:43:02 -04:00
4729bbde5f fix merge conflicts with audioengine 2013-09-06 13:39:26 -04:00
8c5cff6091 Merge branch 'master' into windows 2013-09-06 10:56:36 -04:00
d76efc97a3 Use Glib::usleep for portability 2013-09-06 14:31:31 +10:00
8ddd12a60d Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
2013-09-06 14:31:11 +10:00
94efddd240 fix a problem creating and displaying connected status for ports not owned by ardour (e.g. system:....)
This was caused by using jack_port_get_connections() which will
not return the correct status for ports owned by another JACK
client. Because of the potential for deadlock by calling
jack_port_get_all_connections(), an extra argument was added
to several PortEngine:: API calls to specify whether the call
is in a process-callback context, which defaults to true.

The only place where false is passed is within the GlobalPortMatrix
when we need to determine whether two non-ardour ports are
connected.
2013-09-05 21:39:43 -04:00
bc1cc154dc always save/keep audio/MIDI setup states so that they are available for use *after* instances where JACK was already running 2013-09-05 14:21:25 -04:00
1c49138e00 move MidiPortManager from AudioEngine to Session
This makes the responsibilities and ownership of non-Route related MIDI ports
more clear, and removes a few wierd bits of code. It also ensures that open/close/open
on the same session will retain connections for those MIDI ports
2013-09-05 13:22:34 -04:00
fee626c386 shorten tab labels on audio/midi setup notebook 2013-09-05 13:21:13 -04:00
5a3cf3363b save and restore the selected engine state at startup 2013-09-04 22:58:56 -04:00
0cc4ee7b79 fix up restoration of saved state from disk, still incomplete 2013-09-04 22:22:18 -04:00
418f2ff20a save and restore audio/MIDI setup states to disk (in ardour.rc)
Not finished because the buffer size value will not always stick during restore
2013-09-04 19:34:43 -04:00
58dd0198e6 save and restore settings for different backend/driver/device combinations
So far, this is only internal - never saved to disk
2013-09-04 15:45:54 -04:00
8060198f75 change names of actions groups that include "jack" 2013-09-04 12:49:52 -04:00
35cc3245db rename interface_ stuff in the engine dialog to device_, since that feels a bit clearer terminology 2013-09-04 12:37:44 -04:00
4a135c82fb squash another compiler warning 2013-09-04 01:37:15 +02:00
a6b66f1594 vtl: fix small issue with video source file on export 2013-09-04 01:36:46 +02:00
d074bc586e Merge branch 'master' into audioengine 2013-09-03 17:41:49 -04:00
0013feddbf Merge branch 'master' into windows 2013-09-03 08:34:27 -04:00
12ec604140 updated .po files from waf i18n, plus an updated gtk2_ardour/de.po from Edgar Aichinger 2013-09-03 08:00:58 -04:00
01e0f51223 LV2 extUI handling - amend to previous commit. 2013-09-02 16:57:46 +02:00
c05ad01b2d LV2 external UI handling - revert to <= 3.3. behaviour
Don't ever clean up external UI plugins that use the LV2plug.in URI.
only free the memory of the last instance when the plugin is removed
or ardour closes.
2013-09-02 16:21:12 +02:00
66292718a1 improve scroll and drag behaviour of volume-controller knob 2013-09-01 03:19:13 +02:00
03c26762e6 update external plugin UI handling
amend to 4cdb018 and 1d972d0

override ui_closed() behavior for lv2ui:external
Keep UI around and do not re-instantiate, but simply show it again.
(this is against the original specs but was agreed upon by various
authors and the previous behavior or Ardour.)

kx:external-ui are cleaned up after ui_closed().
2013-08-29 13:05:11 +02:00
1d972d05c5 add LV2 support for kx:external-ui#
the ABI of http://kxstudio.sf.net/ns/lv2ext/external-ui# is identical to
http://lv2plug.in/ns/extensions/ui#external
It just adds a distinction between #Host and #Widget for cosmetic reasons.
Sadly some newer plugins are released with only support for kxstudio URI :(
2013-08-25 16:21:18 +02:00
4cdb018cae free memory of external plugins on GUI close (major mem leak).
There is at least one known plugin that has a problem with this
(custom thread race condition) but it also crashes in other hosts:
http://www.drumgizmo.org/wiki/doku.php?id=bugs&do=showcaselink&showid=8&project=drumgizmo

tested to be working with various nedko, falktx and x42 plugins
2013-08-25 16:21:18 +02:00
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
1421a34e52 pot/po file updates caused by waf i18n 2013-08-24 11:46:45 -04:00
9041d7bc18 don't run meter in import-dialog if the dialog is not visible 2013-08-23 21:26:02 +02:00
7fe7e7ad4b update czech translations from pavel fric 2013-08-15 14:55:10 -04:00
04bf9d1e95 fix newly-appearing crash-at-close caused by muddled thinking in pbd/pthread_utils
threads created with this code can now just return a value as they normally would, and the
infrastructure will ensure cleanup. there is no longer any reason to call pthread_exit_pbd()
and so that has been removed.
2013-08-15 11:44:47 -04:00
e6521bb043 Merge branch 'master' into cairocanvas 2013-08-14 13:11:34 -04:00
6bcdf4f0f1 fix merge issues with master 2013-08-14 13:10:59 -04:00
2de09888b6 some const_cast<> additions for OS X where gcc believes that volatile int* means const int* 2013-08-14 12:40:49 -04:00
e87424f514 re-enable MIDI tracing for ARDOUR::MidiPort 2013-08-13 13:24:05 -04:00
7a431f892e Move curve test file handling in main() until after ARDOUR::init is called
This means it doesn't need to call PBD::ID::init directly, which it now
shouldn't be doing
2013-08-13 20:15:47 +10:00
611058bf58 Remove call to PBD::ID::init as it is now done via ARDOUR::init 2013-08-13 20:15:47 +10:00