13
0
Commit Graph

95 Commits

Author SHA1 Message Date
84bcf59812 Better names for Soundcloud-related members of ExportHandler
Rename the Soundcloud-related members of ExportHandler to all begin with
soundcloud_, and rename a couple of members of SoundcloudExportSelector
too for consistency.
2014-05-23 18:33:43 +01: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
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
Sakari Bergen
f1db14923e Hande export initialization exceptions gracefully 2013-11-23 19:11:31 +02: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
ebd00236f8 Export dialogue visual re-arrangement
Make the export dialogue into a tabbed notebook with three tabs: "File
Format", "Timespan", and "Channels"/"Source".
2013-10-07 10:48:48 +01:00
981e7e7fbb Use Glib::usleep in export_dialog.cc for portability 2013-07-11 22:07:25 -04:00
Sakari Bergen
526a1a71fe Make export type an enum and pass it to the profile manager instead of the xml node name.
Use this to always include the channel configuration name in stem exports.


git-svn-id: svn://localhost/ardour2/branches/3.0@13616 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-07 21:58:33 +00:00
9884773eea various fixes for exporting, including correct handling of errors during export which previously would hang when using jack1 because jack_set_freewheel() was called from inside a process() callback; use shared_ptr<Route> in parts of export code that weren't using them before; fix up generation of export filenames so that Glib::build_filename() is used and non-existent folders are ignored
git-svn-id: svn://localhost/ardour2/branches/3.0@13610 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-12-06 19:56:33 +00:00
e7063bb900 restore the post-export nag screen
git-svn-id: svn://localhost/ardour2/branches/3.0@13576 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-11-30 23:17:58 +00:00
1f440fbfec Remove unused or unnecessary header includes
git-svn-id: svn://localhost/ardour2/branches/3.0@12905 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:09:51 +00:00
132334febe tweak expander label name as per thorsten wilms' suggestion
git-svn-id: svn://localhost/ardour2/branches/3.0@12794 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-20 13:53:39 +00:00
Carl Hetherington
0a4b746317 No-op; some comments, remove some unused stuff, minor tidying up.
git-svn-id: svn://localhost/ardour2/branches/3.0@12616 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-08 21:06:49 +00:00
Sakari Bergen
a5b39d56df Change export dialog widget size allocation and make closing the exander make the window smaller also
(another attempt at fixing #4559


git-svn-id: svn://localhost/ardour2/branches/3.0@11447 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-04 13:18:58 +00:00
Sakari Bergen
8b1e5eca1d Improve usage of expanded window space in the export dialog + put the "advanced" stuff in a Gtk::VPaned
git-svn-id: svn://localhost/ardour2/branches/3.0@11400 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-31 20:42:08 +00:00
Sakari Bergen
dba601eeab Show an example filename in the main export dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@11383 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-29 20:55:44 +00:00
Sakari Bergen
71a5e435e6 Add timespan name to export status text
git-svn-id: svn://localhost/ardour2/branches/3.0@11381 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-29 09:51:30 +00:00
Sakari Bergen
80004a33aa Move export progress text to progress bar from separate label
git-svn-id: svn://localhost/ardour2/branches/3.0@11379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 18:39:56 +00:00
Sakari Bergen
db384a6f14 Go back to one progress bar with several passes in export.
Don't calculate the progress bar position in the engine, let the UI decide. 
Work around progress bar bug (not verified, as I could not reproduce).


git-svn-id: svn://localhost/ardour2/branches/3.0@11377 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 18:14:19 +00:00
Sakari Bergen
eb85208fe8 Implement simple separate progress bar for export normalizing phase(s), needs to be made prettier still after some discussions...
git-svn-id: svn://localhost/ardour2/branches/3.0@11374 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-28 12:55:28 +00:00
Carl Hetherington
1deb4fd7ad Make the export ranges view expand with the export dialogue.
git-svn-id: svn://localhost/ardour2/branches/3.0@10993 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-13 00:15:11 +00:00
7a5a5da953 probably fix failure to find export formats in packages
git-svn-id: svn://localhost/ardour2/branches/3.0@10888 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 20:05:50 +00:00
6fbd05a77d some more package debugging to help find out why export formats are not found
git-svn-id: svn://localhost/ardour2/branches/3.0@10887 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-12-04 19:37:15 +00:00
Carl Hetherington
661bbc2c4e Tidy up overwritten files dialogue slightly.
git-svn-id: svn://localhost/ardour2/branches/3.0@10216 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-10-18 00:24:34 +00:00
Sakari Bergen
1de3eac2de Fix #4094: show total export progress instead of per timespan progress
git-svn-id: svn://localhost/ardour2/branches/3.0@9710 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 21:12:24 +00:00
ed626628b5 Delete trailing whitespace
git-svn-id: svn://localhost/ardour2/branches/3.0@9656 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 17:00:29 +00:00
Carl Hetherington
039a7f544a Make pressing enter in the label or path entries trigger the default dialogue response (fixes #3763).
git-svn-id: svn://localhost/ardour2/branches/3.0@8865 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-16 01:08:25 +00:00
Sakari Bergen
8e35583358 Add stem export dialog and make all different export dialogs save their config to a different node in instant.xml
git-svn-id: svn://localhost/ardour2/branches/3.0@8465 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-01-06 16:55:19 +00:00
3f30e8093e Clean up region.h and trim include tree.
git-svn-id: svn://localhost/ardour2/branches/3.0@8312 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-20 21:22:49 +00:00
da8eec7a83 remove Glib::ustring from gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 16:51:02 +00:00
4d112a8e6b remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-14 15:45:21 +00:00
Carl Hetherington
8d0581a720 Remove use of i18n macros in headers. Prevents our gettext.h being included before libintl.h, which causes failures when ENABLE_NLS is not defined (bug #3111)
git-svn-id: svn://localhost/ardour2/branches/3.0@7081 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-05-08 01:20:33 +00:00
Sakari Bergen
455058835e Remove the realtime export button from the export dialog, as it's not really functional atm
git-svn-id: svn://localhost/ardour2/branches/3.0@6809 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 15:46:17 +00:00
14b0ca31bc handle deletion of UI objects between the time that a callback is queued with the UI event loop and the execution of the callback (intrusive, big)
git-svn-id: svn://localhost/ardour2/branches/3.0@6807 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-03-30 15:18:43 +00:00
Sakari Bergen
dde0848a98 Re-integrate export-optimization branch.
Export now happens directly to file (unless normalizing is required), and can be easily optimized even further.
The Session process connection is still broken during export (as it was before this commit also).


git-svn-id: svn://localhost/ardour2/branches/3.0@6401 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-27 14:46:23 +00:00
f450df300c fully implement and deploy explicit x-thread signal connection syntax (testing comes next)
git-svn-id: svn://localhost/ardour2/branches/3.0@6379 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-21 18:23:07 +00:00
aae367b63c use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-19 20:26:31 +00:00
f6fdd8dcbf switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-17 18:24:23 +00:00
64dc5427e4 make all use of bind/mem_fun be explicitly sigc::
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-11 23:29:48 +00:00
bb9cc45cd2 Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red.  I don't know the emacs equivalent...


git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-10-14 16:10:01 +00:00
Carl Hetherington
25cec845c5 Put advanced bits in an expander. Still need to make the export code default to exporting the master bus from the whole session, somehow.
git-svn-id: svn://localhost/ardour2/branches/3.0@5614 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-09-01 20:14:13 +00:00
Carl Hetherington
3b89d9eaa0 Remove most using declarations from header files.
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-05-12 17:03:42 +00:00
Sakari Bergen
ab47be7b5a Some preparations for allowing multiple channel configurations in export channel configurations.
Also unified the timespan selector interface...


git-svn-id: svn://localhost/ardour2/branches/3.0@4748 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-03-08 10:56:40 +00:00
e0aaed6d65 *** NEW CODING POLICY ***
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.

Do this:

#include "ardour/types.h"

NOT this:

#include <ardour/types.h>

Rationale:

This is best practice in general, to ensure we include the local version
and not the system version.  That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.

More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly.  That is:

!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!

Failure to comply is punishable by death by torture. :)

P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).


git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-02-25 18:26:51 +00:00
Sakari Bergen
ccc3461a58 More Export GUI tweaks....
git-svn-id: svn://localhost/ardour2/branches/3.0@3926 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-11 15:35:36 +00:00
Sakari Bergen
41c892802f * Some Export GUI tweaks
* Export region with fades
* Removed some debug output


git-svn-id: svn://localhost/ardour2/branches/3.0@3923 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-11 14:07:50 +00:00
Sakari Bergen
98389f7da4 Region export dialog: Make export channel and -selector polymorphic, add the region related classes and a dialog specialization
git-svn-id: svn://localhost/ardour2/branches/3.0@3915 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-10-11 10:14:51 +00:00
Sakari Bergen
ef9beb3f60 * Fixed const correctness error in Location
* Reworked ExportMainDialog in preparation for the creation of CD and region export dialogs:
  * Separated ExportPresetSelector and ExportFileNotebook from ExportMainDialog
  * Made ExportTimespanSelector polymorphic regarding single/multiple timespan mode
  * renamed ExportMainDialog to ExportDialog and made it easily customizable
  * created ExportRangeDialog and ExportSelectionDialog, these can be later customized more if necessary


git-svn-id: svn://localhost/ardour2/branches/3.0@3834 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-29 17:01:52 +00:00
Sakari Bergen
aac2beaed3 Deleted old export dialog file
git-svn-id: svn://localhost/ardour2/branches/3.0@3832 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-29 16:45:52 +00:00