smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity
35990 commits 101 branches 144 tags 307 MiB
Commit graph

544 commits

Author SHA1 Message Date
Paul Davis
69a8fc43e2 Merge branch 'master' into windows 2013-10-15 11:17:12 -04:00
John Emmas
e466ce40ad Merge branch 'master' into windows+cc 
Conflicts (hopefully resolved):
	gtk2_ardour/ardour_ui.cc
 2013-10-14 19:31:22 +01:00
Robin Gareus
44b359b70a enable videotimeline on OSX 2013-10-12 23:04:37 +02:00
Paul Davis
2a6a16f980 merge with master, fixing conflicts in 3 wscript files 2013-10-09 14:00:42 -04:00
Colin Fletcher
070bb7a8ab Move system_exec from gtk2_ardour/ to libs/pbd/ 2013-10-07 21:16:42 +01:00
Colin Fletcher
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
Colin Fletcher
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
John Emmas
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
Paul Davis
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
John Emmas
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
Paul Davis
7a30e63eaa fix merge conflicts with master 2013-09-14 16:42:40 -04:00
Paul Davis
bb826f4bee incomplete merge of master into windows (requires upcoming changes to master to be complete) 2013-09-12 11:28:50 -04:00
Paul Davis
ee1b49f87e fix merge conflicts from master 2013-08-24 12:18:06 -04:00
Robin Gareus
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
Paul Davis
f0fcda2044 Merge branch 'master' into audioengine 2013-08-09 16:29:23 -04:00
Paul Davis
f44e0f33af a few more visual tweaks and simplifications for audio/midi setup 2013-08-09 00:50:41 -04:00
Robin Gareus
897074730a remove --no-freesound option. fixes #5640 2013-08-08 20:08:20 +02:00
Paul Davis
00ae5492f4 (reapply with fixes) Build system changes to support mingw build target 2013-07-15 13:43:17 -04:00
Paul Davis
96ea407d1a Revert "Build system changes to support mingw build target" 
This reverts commit 94145732f3.
 2013-07-15 13:21:22 -04:00
Paul Davis
94145732f3 Build system changes to support mingw build target 2013-07-15 13:16:09 -04:00
Paul Davis
580520b12f fix conflicts caused by meterbridge merge 2013-07-11 09:11:53 -04:00
Robin Gareus
68762b9efd break out meter&metric pattern rendering.. first step towards new mixer-meters 2013-07-10 15:27:10 +02:00
Robin Gareus
35937e5083 implement meterbridge & meter-strip 2013-07-10 15:27:02 +02:00
Robin Gareus
b0998844db basic window infrastructure for meterbridge 2013-07-10 15:27:02 +02:00
Paul Davis
f00b3b7f11 merge with master 2013-06-13 23:00:24 -04:00
Paul Davis
2e1e5da78e more changes to consolidate version definition into the top level wscript file 2013-06-11 11:37:52 -04:00
Paul Davis
ef6366a7cd adjust the way version and revision info are gathered, defined and used 2013-06-11 10:58:24 -04:00
Robin Gareus
1ca430babd separate general vs temporary(no vtl) OSX defines 2013-06-11 01:26:49 +02:00
Paul Davis
bebe2af95a merge with master 2013-05-08 14:48:28 -04:00
Paul Davis
cadfc2aee1 various miscellany related to versions, gtk2 build and packaging 2013-05-08 13:16:50 -04:00
Paul Davis
e1b0f1bd0b merge with master 2013-05-04 22:41:10 -04:00
Paul Davis
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
Robin Gareus
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
Robin Gareus
66ee2c8e59 enable videotimeline by default 2013-04-11 19:49:48 +02:00
Paul Davis
19bd641915 commit immediately post linking 2013-04-04 18:45:27 -04: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
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
Robin Gareus
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
Paul Davis
9eaefe3d12 remaining part of static library commit, should have been a part of 16ce39c230 2013-03-20 17:22:32 -04:00
David Robillard
852e7c01ad Hopefully fix ardour.menus rebuilding when things change. 2013-03-17 13:47:51 -04:00
Robin Gareus
0c3e840700 videotimline 
squashed 694 commits from http://gareus.org/gitweb/?p=ardour3.git
 2013-03-13 20:28:15 +01:00
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
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
Paul Davis
edf28762a0 part 4 of OS X font stuff 
git-svn-id: svn://localhost/ardour2/branches/3.0@14183 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-03-08 03:49:15 +00:00
Paul Davis
d2fb58dc14 typo 
git-svn-id: svn://localhost/ardour2/branches/3.0@14182 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-03-08 03:46:26 +00:00
Paul Davis
0701fa3829 part 3 of OS X font stuff 
git-svn-id: svn://localhost/ardour2/branches/3.0@14181 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-03-08 03:43:17 +00:00
Paul Davis
845d2e0f3b potential fix, part one, for Tiger-based font issues 
git-svn-id: svn://localhost/ardour2/branches/3.0@14178 d708f5d6-7413-0410-9779-e7cbd77b26cf
 2013-03-08 03:34:34 +00:00