13
0
Commit Graph

348 Commits

Author SHA1 Message Date
b2b736d596 tweaks for the monitor section. refactoring of some buttons, using new ArdourKnob instead of VolumeController. New ArdourDisplay shows a controllables user value, and provides support for preset values (hardcoded at present). Further refactoring to come, so that ArdourWidgets are derived from a common class. Controllable now has more responsibility for scaling between internal, user, and interface (knob percent) values. This also needs more refactoring and might have some unintended consequences. tested with audio and nothing seems amiss, yet. 2014-07-18 08:47:45 -05:00
e8106bb415 minor fixes to wscript files to make things python3 compatible 2014-07-13 08:36:18 -04:00
298085eec2 use new ruler dialog class for context clicks on ruler labels area 2014-06-25 15:23:25 -04:00
16aa2fb61c build ardour3_ui_default.conf at build time, to allow font substitutions to be done (which are platform dependent) 2014-06-13 12:22:39 -04:00
43e2baf54e remove gtk ruler widget implementation - no longer in use 2014-06-12 00:01:06 -04:00
7ba3e50e51 Fix paths in ardour.sh 2014-06-07 13:49:11 +10:00
d5fa80e01d fix linking against libasound 2014-06-02 21:09:21 +02:00
5399425f53 Merge branch 'export-dialog' into cairocanvas
Fix merge conflicts in:
	gtk2_ardour/export_range_markers_dialog.cc
	gtk2_ardour/wscript
	libs/ardour/ardour/export_handler.h
	libs/ardour/system_exec.cc
	libs/pbd/pbd/system_exec.h
	libs/pbd/system_exec.cc
2014-05-19 20:54:36 +01:00
c464feb6aa indent in wscript uses spaces 2014-05-19 20:50:37 +01:00
fbbf911229 fix mingw build - needs bundle_env_mingw.cc when building with mingw, and that is a build target, not a platform 2014-05-06 14:07:29 -04:00
e6cb3e8bb2 remove two more unnecessary instances of os.path.join in install path definitions 2014-04-29 16:06:39 -04:00
f678700376 amend previous commit, remove cruft, no more extern function pointers 2014-04-11 19:36:17 +02:00
2974c87684 parameterize install target directories based on --program-name configure option 2014-04-10 10:23:16 -04:00
21a6c20e9a always build all per-program menu files so that we can try them out with different builds 2014-04-10 07:31:26 -04:00
716c5b0642 new configure option for trx build, which also generates new menus file 2014-04-10 05:58:49 -04:00
6bcee4e9c8 rename ArdourMenu to ArdourDropdown 2014-03-26 11:40:25 -05:00
harrison
b9708d5f6b New theme for editor window using ArdourMenu 2014-03-23 18:11:42 -05:00
495c0de4ac fix up waf build in wake of search path changes earlier today 2014-03-10 17:30:12 -04:00
912f07b919 mingw build fixes (tested with i686-w64-mingw32 on linux-x86_64) 2014-03-04 15:25:58 +01:00
9952f774e9 some mingw related tweaks to the build-environment. 2014-03-03 16:09:14 +01:00
40c426fc5d install small-splash image 2014-03-02 12:24:16 -05:00
3b5cc5a9fd move fixup_bundle_environment() code into per-platform files 2014-03-02 11:30:51 -05:00
3cf5dcb64c move Paths Dialog to libgtkmm2ext 2014-02-28 00:05:47 +01:00
4aaae2eb3b user-configurable VST search paths (basic UI) 2014-02-26 18:07:46 +01:00
bcf6c76462 consolidate lxVST & winVST file-info code into libardour
first step and clennup before adding support for
VST shell-plugins (collections) and external scanner app...
2014-02-23 05:51:58 +01:00
7f714ca036 remove inadvertently committed wine-unstable linkdir 2014-02-22 03:23:36 +01:00
0adac4e251 update wscript for windowsVST + mingw 2014-02-22 03:11:49 +01:00
1d39cf7543 move SystemExec to libpbd 2014-02-19 03:38:43 +01:00
0a2a6aaabb remove taglib from source tree (require external provision) 2014-01-12 15:40:48 -05:00
658bb3ccd4 finished merge of cairocanvas with windows and windows+cc branches 2014-01-10 17:11:10 -05:00
3020b224fa Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there 2014-01-10 16:07:57 -05:00
52003be369 Merge remote-tracking branch 'origin/master' into export-dialog
Fix conflicts in:
	gtk2_ardour/export_dialog.cc
	gtk2_ardour/export_dialog.h
	libs/ardour/export_handler.cc
2014-01-08 15:50:34 +00:00
b0e4f81eb3 merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
Still need to add API export/visibility macros for the canvas library.
2013-12-27 14:29:06 -05:00
84f55440a3 fix redrawing of canvas with an optimized build
Best guess right now is that optimization does something bad when ceil() is called twice on a very large dbl-precision number,
which results in a zero (empty) redraw area. Without the removal of the redundant ceil & floor functions, no expose events
would be delivered to the canvas in an optimized build during drags (and maybe more).
2013-12-23 15:35:49 -05:00
d98c5f7aee better, probably working fix for windows-vst-on-linux build 2013-12-22 13:39:57 -05:00
9f17579d71 attempt to fix build with --windows-vst due to a bad merge of the external libs changes 2013-12-22 13:13:59 -05:00
94993816cc move portable copyfile function into tools/autowaf.py and use it in both gtk2_ardour and taglib 2013-12-19 12:55:52 -05:00
339fc9ed13 fix platform portability issues caused by use of shell cp(1) command and perl script 2013-12-05 14:44:37 -05:00
8648a8a13b fix up wscript/build issues in exportvis after merge with master 2013-12-03 11:51:25 -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
08371ae2cf resolve merge with master (?) 2013-11-26 10:24:51 -05:00
ea1ccb869a fix merge with master 2013-10-31 13:16:51 -04: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
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
69a8fc43e2 Merge branch 'master' into windows 2013-10-15 11:17:12 -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
44b359b70a enable videotimeline on OSX 2013-10-12 23:04:37 +02:00
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
070bb7a8ab Move system_exec from gtk2_ardour/ to libs/pbd/ 2013-10-07 21:16:42 +01:00
a3465ff5d3 Working Soundcloud export
Adds an 'upload' property to ExportFormatSpecification, to indicate that files
exported with that format specfication should be uploaded to Soundcloud, and
makes it editable in the export format dialogue.
Adds fields for the Soundcloud username & password to the file format selection
page, as well as an option to make the uploaded files public and open them in
the system browser.

Possible improvements not yet implemented:
- make upload happen in its own thread
- cosmetic tidying up of dialogue control layout
- remember username & password
2013-10-07 14:59:40 +01:00
15b4ebbb07 add soundcloud export to wscript, and make it compile.
add soundcloud exporter to gtk2_ardour/wscript, and fix compile errors by using
std::string in place of string everywhere.
2013-10-07 12:23:00 +01: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
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
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
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -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
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
cc92c879bf Merge branch 'master' into ccmerge
Conflicts:
	gtk2_ardour/ardour_ui_options.cc
	gtk2_ardour/generic_pluginui.cc
	gtk2_ardour/level_meter.cc
	gtk2_ardour/utils.cc
	gtk2_ardour/utils.h
	gtk2_ardour/video_image_frame.cc
2013-08-10 15:41:40 +02:00
f0fcda2044 Merge branch 'master' into audioengine 2013-08-09 16:29:23 -04:00
f44e0f33af a few more visual tweaks and simplifications for audio/midi setup 2013-08-09 00:50:41 -04:00
897074730a remove --no-freesound option. fixes #5640 2013-08-08 20:08:20 +02:00
00ae5492f4 (reapply with fixes) Build system changes to support mingw build target 2013-07-15 13:43:17 -04:00
96ea407d1a Revert "Build system changes to support mingw build target"
This reverts commit 94145732f3.
2013-07-15 13:21:22 -04:00
94145732f3 Build system changes to support mingw build target 2013-07-15 13:16:09 -04:00
580520b12f fix conflicts caused by meterbridge merge 2013-07-11 09:11:53 -04:00
68762b9efd break out meter&metric pattern rendering.. first step towards new mixer-meters 2013-07-10 15:27:10 +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
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04: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
1ca430babd separate general vs temporary(no vtl) OSX defines 2013-06-11 01:26:49 +02:00
bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
cadfc2aee1 various miscellany related to versions, gtk2 build and packaging 2013-05-08 13:16:50 -04:00
e1b0f1bd0b merge with master 2013-05-04 22:41:10 -04:00
40944574c6 the big rework of window management. probably not complete at thsi point, but this is mostly functional 2013-05-04 22:02:05 -04:00
6ae4f10437 Merge branch 'master' into cairocanvas
Conflicts:
	gtk2_ardour/editor.h
	gtk2_ardour/editor_canvas.cc
	gtk2_ardour/wscript
2013-04-11 22:24:05 +02:00
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04:00
aaea166135 initial commit of hand merging, plus getting "ancient" waf script to work correctly 2013-04-04 00:32:52 -04:00
5a4d0fff01 vtl: remove xjadeo option dialog
xjadeo options (selective session restore) are only
useful for testing and debugging.
2013-04-02 18:06:38 +02:00
Roy Vegard Ovesen
6ef371745a non-session-manager support
Implements open, save and dirtiness.
No error checking, no menu items disabling.
2013-03-31 03:59:09 +02:00
daec8e44d5 vtl: rework import workflow
- do not allow to simply copy the video file
 - decision to transcode or just reference is made in "transcode dialog"
   not during file-selection.
   Only there the actual codec is known and can be judged to be suitable
   for direct reference
 - simplify "transcode dialog" - no more buttons for specific actions,
   drop-down select actions.
 - increase minimum bitrate for imported file to 500kbit/s
2013-03-29 12:36:14 +01:00
9eaefe3d12 remaining part of static library commit, should have been a part of 16ce39c230 2013-03-20 17:22:32 -04:00
852e7c01ad Hopefully fix ardour.menus rebuilding when things change. 2013-03-17 13:47:51 -04:00
0c3e840700 videotimline
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
2013-03-13 20:28:15 +01:00
25eb9f4069 use lucida grande for clocks with all OS X versions, BUT BETTER
git-svn-id: svn://localhost/ardour2/branches/3.0@14201 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-09 15:12:27 +00:00
4e31d99e10 use lucida grande for clocks with all OS X versions
git-svn-id: svn://localhost/ardour2/branches/3.0@14200 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-09 15:11:04 +00:00
30938c1dcf attempted further rationalization of clock font issues (especially fr OS X
git-svn-id: svn://localhost/ardour2/branches/3.0@14199 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-09 14:01:48 +00:00
ba73a77c63 switch to Lucida Sans Typewriter as OS X monospace font; new pingback code to get announcements from ardour.org (can be disabled on the command line with -a)
git-svn-id: svn://localhost/ardour2/branches/3.0@14189 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-03-08 16:41:45 +00:00