Commit graph

61 commits

Author SHA1 Message Date
Colin Fletcher
0b37220cf9 Export dialog: tidy code, & remove some superfluous debug output
Remove some debug output, tidy up a few whitespace inconsistencies, use
DEBUG::Soundcloud in one more place, and zap a couple of unused variables.

Conflicts:
	libs/ardour/export_handler.cc
2014-08-17 15:13:20 -04:00
Colin Fletcher
ccd4f9ccdc Post-export hook tweaks
Remove the Soundcloud username & password from the parameter substitutions
passed to the post-export hook: having thought about this now, I can't
actually think of a case where these are of any use at all.

In compensation, add %s and %n parameters that expand to the session
directory and name - maybe people will think of uses for these.

Conflicts:
	libs/ardour/export_handler.cc
2014-08-17 15:12:38 -04:00
Paul Davis
c934033e23 manually jump forward state of system_exec files to avoid various cherry-picking-related problems during merge with ardour 2014-08-16 17:53:33 -04:00
Colin Fletcher
c2bdb00b0c Use SystemExec for post-export hook
Use the new command-line parsing constructor for SystemExec to construct
the args array for the post-export hook from the entered command string,
with some simple substitutions for filename, directory, &c.

Conflicts:
	gtk2_ardour/export_format_dialog.cc
	libs/ardour/export_handler.cc
2014-08-16 17:43:50 -04:00
Colin Fletcher
4ed46acd77 Add and use a DEBUG flag for Soundcloud uploads.
Replace output to stdout/stderr from Soundcloud upload functions with
DEBUG_TRACE (DEBUG::Soundcloud, ...).
2014-08-16 17:07:45 -04:00
Colin Fletcher
11ff88d417 Show URI of file uploaded to Soundcloud in log window. 2014-08-16 17:07:23 -04:00
Colin Fletcher
620c827129 Visual tweaks to Soundcloud panel
Re-arrange the items in the Soundcloud panel into a more sensible order &
arrangement, and add a (not-yet functional) tick-box to set the uploaded
files to be downloadable.
2014-08-16 17:07:18 -04:00
Colin Fletcher
07ba0efa8d 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.

Conflicts:
	gtk2_ardour/export_dialog.cc
	libs/ardour/export_handler.cc
2014-08-16 17:07:05 -04:00
Colin Fletcher
eec3f494ec Make Soundcloud upload applicable to any export format.
Add soundcloud_upload property back into ExportFormatSpecification, but
instead of making it settable in the export format specification dialog,
add a tick-box in each tab of ExportFileNotebook to allow setting it.
2014-08-16 17:04:53 -04:00
John Emmas
061ee1cfa3 Use Glib::usleep() for consistency 2014-08-16 17:01:49 -04:00
Colin Fletcher
4f1b021cd7 Use ARDOUR namespace for SystemExec
Explicitly use ARDOUR::SystemExec, and #include the right header for it
too.

Conflicts:
	libs/ardour/export_handler.cc
2014-08-16 16:52:11 -04:00
Colin Fletcher
17b0f6d336 Rudimentary post-processing of exported files.
Export format contains a string to be passed to system() after expanding
%1, %2, & %3 via string_compose() to the full path & filename, containing
directory, and basename respectively. No error-checking or any niceties
like that - real programmers will of course always type the command
correctly, and know to watch Ardour's standard output for the results...
2014-08-16 15:06:00 -04:00
Colin Fletcher
ac494effbe cherry pick a3465ff5d3 from ardour-cc and resolve conflicts 2014-08-15 23:45:37 -04:00
Paul Davis
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
Sakari Bergen
e00d9dd585 Re-enable export file tagging. No idea why this code has dropped out at some stage... 2013-12-23 20:26:51 +02:00
Paul Davis
15be154515 use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files 2013-07-15 14:29:00 -04:00
Sakari Bergen
8cbb9727e9 Handle mutiple export files with the same extension but different format.
If multiple filenames have the same extension, append the format name
to the filename. This still requires a bit of extra logic to be optimal,
as the format name will now be added in some situations where it is not
needed. However, this is better than producing a broken file...
2013-03-17 12:32:48 +02:00
Tim Mayberry
69c518f91e Remove unused header include
git-svn-id: svn://localhost/ardour2/branches/3.0@12835 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-23 05:07:09 +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
David Robillard
6fa6514cfd Remove over 500 unnecessary includes (including 54 of session.h).
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.


git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-24 06:09:29 +00:00
Paul Davis
bb98baf413 fix a few dangling uses of Ardour as program name, in favor of PROGRAM_NAME
git-svn-id: svn://localhost/ardour2/branches/3.0@11563 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-02-29 20:18:18 +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
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
Paul Davis
d17918e32e patch for CUE file formatting from Andreas Ruge
git-svn-id: svn://localhost/ardour2/branches/3.0@11368 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-27 19:15:47 +00:00
Paul Davis
18bc80a01c toc filename handling patch from andreas r.
git-svn-id: svn://localhost/ardour2/branches/3.0@11352 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-25 21:14:51 +00:00
Sakari Bergen
f57da9b00e Show proper progress information for export while normalizing
git-svn-id: svn://localhost/ardour2/branches/3.0@11337 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 20:21:54 +00:00
Paul Davis
175036ea4e always write a PERFORMER entry into a CUE file even if its not defined
git-svn-id: svn://localhost/ardour2/branches/3.0@11331 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 16:18:06 +00:00
Paul Davis
d0ef18e94e improved fix for TOC string escaping, handle anything that can be converted from UTF-8 to Latin-1
git-svn-id: svn://localhost/ardour2/branches/3.0@11323 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-24 01:03:42 +00:00
Paul Davis
5248d79fa4 undo escaping of strings in CUE files
git-svn-id: svn://localhost/ardour2/branches/3.0@11321 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 22:11:01 +00:00
Paul Davis
9a21640567 a better fix for CUE/TOC string escaping: if the text is not Latin-1 already, reject it because TOC certainly cannot handle UTF-8 and CUE is probably better off without it too
git-svn-id: svn://localhost/ardour2/branches/3.0@11320 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 21:53:08 +00:00
Paul Davis
9c6ef3788c escape \ as \034 in TOC files
git-svn-id: svn://localhost/ardour2/branches/3.0@11314 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 17:24:34 +00:00
Paul Davis
cbaa0d472e fix up escaping of strings in TOC files (suggested by andreas ruge)
git-svn-id: svn://localhost/ardour2/branches/3.0@11313 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-23 17:16:53 +00:00
Sakari Bergen
09d1fbd6c1 Add warnings for overwriting marker files
git-svn-id: svn://localhost/ardour2/branches/3.0@11305 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 18:02:27 +00:00
Carl Hetherington
9080c672a5 Patch from anrug to always put a PERFORMER field in TOC
files (#4649).


git-svn-id: svn://localhost/ardour2/branches/3.0@11299 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-22 10:43:37 +00:00
Paul Davis
65c8d673a2 restore ability to create TOC and CUE files during export. this is an option in a given export format, not a per-export choice. so you need export formats with them set (or not) in order to utilize this choice. the resulting CUE/TOC files have not been checked with a burner (e.g. cdrdao) and testing of them would be appreciated - i (paul) have no CD burner h/w
git-svn-id: svn://localhost/ardour2/branches/3.0@11266 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-01-18 21:56:06 +00:00
Carl Hetherington
6583376d05 Patch from Colin to fix a search/replace bug in TOC/CUE generation (#4336).
git-svn-id: svn://localhost/ardour2/branches/3.0@10148 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-27 20:20:04 +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
Sakari Bergen
7468fdb9ca Typedef all globally used export smart pointer types in one file.
Some of them need to be ordered in STL containers, and thus need
a special comparable wrapper for boost::shared_ptr, defined in
comparable_shared_ptr.h. This also alleviates the typedef hell
present earlier in some export classes :)

Making the timespan pointer comparable should fix bug #4093


git-svn-id: svn://localhost/ardour2/branches/3.0@9702 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-11 14:14:24 +00:00
David Robillard
a473d630eb Fix broken whitespace. I'd apologize for the compile times if it was my fault :D
git-svn-id: svn://localhost/ardour2/branches/3.0@9654 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-01 16:50:12 +00:00
Sakari Bergen
94c69b3c91 Finally implement position aware silence adding in export (i.e. bbt times are converted to frames correctly)
This will work when Session::convert_to_frames_at is fixed :)


git-svn-id: svn://localhost/ardour2/branches/3.0@8295 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-18 19:27:04 +00:00
Carl Hetherington
73192bc1a7 Remove all use of nframes_t.
git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-03 22:26:29 +00:00
Paul Davis
ede4ecbb00 megaopus patch #2 for today: remove nframes64_t and sframes_t from source
git-svn-id: svn://localhost/ardour2/branches/3.0@7792 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-09-17 18:20:37 +00:00
Paul Davis
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
b6642d14ca Write BWF info on export. Fixes #3398.
git-svn-id: svn://localhost/ardour2/branches/3.0@7652 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-19 14:58:54 +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
Carl Hetherington
895bad1dcd Make the session start/end location a single location (with start and end) rather than two separate ones. Fixes #1298.
git-svn-id: svn://localhost/ardour2/branches/3.0@6929 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-04-18 21:29:48 +00:00
David Robillard
650c6d5824 Fix various code quality issues found by cppcheck (e.g. uninitialized members, larger than necessary variable scope, memory leaks, etc).
git-svn-id: svn://localhost/ardour2/branches/3.0@6710 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-02-23 20:25:53 +00:00
Sakari Bergen
8da27200d1 - Fix process callbakc handling during export
- Fix filename handling when exporting multiple files
- Some updates to audiographer


git-svn-id: svn://localhost/ardour2/branches/3.0@6402 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-12-27 22:09:40 +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
Paul Davis
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