Commit graph

85 commits

Author SHA1 Message Date
Robin Gareus
2c2002ee9c Prepare for optional timespan name during export. 2016-02-11 20:58:05 +01:00
Robin Gareus
c1642fead8 Post-export Analysis 2016-02-10 03:01:05 +01:00
Robin Gareus
1ec78d26ee Fix crash when aborting export.
The "Stop" button results in ExportHandlerPtr being destroyed.
This must not happen while it's in use -- in particular during
ExportHandler::start_timespan() and ExportHandler::finish_timespan()
2016-02-09 21:36:49 +01:00
Robin Gareus
c00a07e811 detailed export state, prepare resolution for #6512
(Post-processing step should announce itself during an export)
2016-02-09 13:15:54 +01:00
Robin Gareus
6ec38e9193 remove last ofstream 2015-10-13 09:55:53 +02:00
Robin Gareus
2397429e99 use quotes for in-tree pbd/glib wrapper include 2015-10-05 22:15:18 +02:00
Robin Gareus
22b07e0233 NOOP, remove trailing tabs/whitespace. 2015-10-05 16:17:49 +02:00
Paul Davis
4dc63966f0 globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
Robin Gareus
7ac691ec82 use pbd's gstdio compatibility wrapper 2015-09-17 14:37:57 +02:00
Robin Gareus
67c75c5a33 fix file metadata tagging on windows.
This allows TagLib to open the file and create a Tag object (see 2a0365c)
Tagging still fails later (taglib seek/SetFilePointer fails when writing)
2015-07-30 05:28:43 +02:00
Paul Davis
d1747b4137 no-op: indentation and whitespace fixes 2015-06-29 14:18:11 -04:00
GZharun
ae8c494c02 [Summary] Added export cleanup
[Reviewed by] Andriy Mishyn
2015-06-29 14:18:11 -04:00
Colin Fletcher
e5ea600ba0 Remove "" around CATALOG number in .cue file
cue2ddp definitely wants the bar code number *not* enclosed in quotes in
.cue files. Leave the quotes in .toc files: cdrdao definitely does need
these.
2015-06-21 14:48:33 +01:00
Colin Fletcher
ca9c7b169d Enclose bar code number in ""s in TOC & CUE export
cdrdao seems to want the CATALOG field to be enclosed in double-quotes.
2015-06-08 14:42:24 +01:00
Colin Fletcher
429355b0b3 Remove doubled quotes in TOC export PERFORMER field
toc_escape_text() already encloses its result in ""s, and if album_artist
is empty, the resulting PERFORMER """" line makes cdrdao upset. Just remove
the extra quotes.
2015-06-08 14:42:24 +01:00
Johannes Mueller
9ba98ae2d3 Remove filename extension for chapter mark file
The tool mp4chaps by the following command

$ mp4chaps -i test.mp4

looks for the file "test.chapters.txt" to read the chapter marks
from. So removing the original file name extension (e.g. wav or flac)
makes it slightly more convenient for the user.
2015-04-21 18:15:29 +02:00
Johannes Mueller
ca8ff95420 Put an Intro chapter at position 00:00:00.000
Players like vlc seem to stumble, if there es no chapter at the zero
position. As Ardour wouldn't let us put a track mark at the zero
position we can just use our header_func to put some kind of dummy intro
chapter. If a future version of Ardour allows track marks at zero, we
need to do a bit more work.
2015-04-21 18:15:29 +02:00
Johannes Mueller
acd1ee1989 Added support for exporting mp4 chapter marks
The mp4 file format supports chapter marks using the so called
mp4chaps format to enable chapter wise navigation in an mp4 file. The
format is like

hh:mm:ss.sss Chapter Title

This commit adds the ability to export those kind of chapter marks
along with TOC and CUE marks. The filename extension for the chapter
mark file is "chapters.txt". The format specification description is
"MP4ch".
2015-04-21 18:15:29 +02:00
Colin Fletcher
050c9c3f7d Add CD Metadata "PERFORMER" & "TITLE" fields to .toc & .cue export
Add "PERFORMER" to the exported .toc & .cue files based on the value of the
"album_artist" metadata field, and also use the value of the "album" field
for the TITLE if is set, falling back to the session or range name if it is
blank.
2015-03-28 18:34:03 +01:00
Colin Fletcher
8806e6ec9d Export EAN barcode number to 'CATALOG' field in .cue & .toc files 2015-03-28 18:34:02 +01:00
David Robillard
6e482b3488 Remove unused variable and redundant arithmetic. 2014-11-18 02:55:03 -05:00
Colin Fletcher
44f71ce599 Text tweaks and typo fixes 2014-10-02 18:03:19 +01:00
Colin Fletcher
5edca6c96e Report an error when post-export hook fails. 2014-07-05 21:47:49 +01:00
Colin Fletcher
f0dbd6c085 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.
2014-06-12 23:20:05 +01:00
Colin Fletcher
70308f5174 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.
2014-06-12 23:20:05 +01:00
Colin Fletcher
aa318a2fc3 Add and use a DEBUG flag for Soundcloud uploads.
Replace output to stdout/stderr from Soundcloud upload functions with
DEBUG_TRACE (DEBUG::Soundcloud, ...).
2014-05-23 19:36:47 +01:00
Colin Fletcher
29f0ad473f Show URI of file uploaded to Soundcloud in log window. 2014-05-23 18:47:33 +01:00
Colin Fletcher
b49e398250 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-05-23 18:45:40 +01:00
Colin Fletcher
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
Colin Fletcher
9daab3db84 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-05-23 18:14:37 +01:00
John Emmas
a47f9084db Use Glib::usleep() for consistency 2014-05-21 12:45:13 +01:00
Colin Fletcher
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
Colin Fletcher
ba08ae9641 Use ARDOUR namespace for SystemExec
Explicitly use ARDOUR::SystemExec, and #include the right header for it
too.
2014-05-18 22:34:04 +01: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
Colin Fletcher
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
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
Colin Fletcher
cac644270a 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.
2013-10-10 19:54:22 +01:00
Colin Fletcher
2a93f7a25e 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...
2013-10-07 20:28:13 +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
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