Commit graph

45 commits

Author SHA1 Message Date
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
Paul Davis
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
Paul Davis
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
David Robillard
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
Sakari Bergen
e2601b67ff cd marker export patch from Andreas Ruge modified for 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0@5173 d708f5d6-7413-0410-9779-e7cbd77b26cf
2009-06-11 19:50:24 +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
David Robillard
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
641dbfcaa2 * Fix problem with JACK being left in freewheeling after export
* Add quotes to cuefile filename entries


git-svn-id: svn://localhost/ardour2/branches/3.0@4098 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-11-06 20:22:48 +00:00
Sakari Bergen
6b50ba341d * Improved export error handling, streamlined ExportFailed
* Cleaned out export related visibility in Session, and simpified Session <--> export component communication in general
* Removed export_status.h header dependency from session.h
* Added check for libsndfile FLAC and Ogg Vorbis compatibility
* Added ExportFileFactory, leading in cleaner code in ExportProcessor, and better extensibility for possible future non-libsndfile formats


git-svn-id: svn://localhost/ardour2/branches/3.0@3818 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-28 11:11:38 +00:00
Sakari Bergen
eec19ca7af * Added filename extension definitions for export presets and format profiles
* Export Preset widget doesn't allow overwriting existing presets 
* Some error detection for export preset loading
* Moved some serialization code away from ExportProfileManager to respective classes


git-svn-id: svn://localhost/ardour2/branches/3.0@3778 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-20 22:06:02 +00:00
Sakari Bergen
68f04adec1 * Added PBD::UUID
* uuid headers are needed for building!
* Export presets and format profiles use UUID
* Moved ExportPreset class away from ExportProfileManager
* Workaround for Gtk::NoteBook bug in ExportMainDialog


git-svn-id: svn://localhost/ardour2/branches/3.0@3762 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-19 16:56:01 +00:00
Paul Davis
f2b007195c new files from sakari, missed last time
git-svn-id: svn://localhost/ardour2/branches/3.0@3740 d708f5d6-7413-0410-9779-e7cbd77b26cf
2008-09-17 12:58:33 +00:00