diff options
author | Carl Hetherington <carl@carlh.net> | 2010-08-19 14:58:54 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-08-19 14:58:54 +0000 |
commit | b6642d14ca64153b5731d1a3a79e4d00060541ca (patch) | |
tree | d5c2ee3b0ce0452a08f3bc950604db63f7b4118e /libs/audiographer/audiographer | |
parent | a958dd0512a29894096e67ccd41a3d879b6bc162 (diff) |
Write BWF info on export. Fixes #3398.
git-svn-id: svn://localhost/ardour2/branches/3.0@7652 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/audiographer/audiographer')
-rw-r--r-- | libs/audiographer/audiographer/broadcast_info.h | 86 | ||||
-rw-r--r-- | libs/audiographer/audiographer/sndfile/sndfile_writer.h | 9 |
2 files changed, 93 insertions, 2 deletions
diff --git a/libs/audiographer/audiographer/broadcast_info.h b/libs/audiographer/audiographer/broadcast_info.h new file mode 100644 index 0000000000..c111156c82 --- /dev/null +++ b/libs/audiographer/audiographer/broadcast_info.h @@ -0,0 +1,86 @@ +/* + Copyright (C) 2008 Paul Davis + Author: Sakari Bergen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifndef AUDIOGRAPHER_BROADCAST_INFO_H +#define AUDIOGRAPHER_BROADCAST_INFO_H + +#include <string> +#include <ctime> + +#include <sndfile.h> + +namespace AudioGrapher +{ + +class SndfileHandle; + +class BroadcastInfo +{ + public: + + /// Construct empty broadcast info + BroadcastInfo (); + virtual ~BroadcastInfo (); + + /// Returns last error sring from libsndfile + std::string get_error () const { return error; } + + /* Reading */ + + bool load_from_file (std::string const & filename); + bool load_from_file (SNDFILE* sf); + + std::string get_description () const; + int64_t get_time_reference () const; + struct tm get_origination_time () const; + std::string get_originator () const; + std::string get_originator_ref () const; + + /* Writing */ + + bool write_to_file (std::string const & filename); + bool write_to_file (SNDFILE* sf); + bool write_to_file (SndfileHandle* sf); + + void set_description (std::string const & desc); + void set_time_reference (int64_t when); + void set_origination_time (struct tm * now = 0); // if 0, use time generated at construction + virtual void set_originator (std::string const & str = ""); + void set_originator_ref (std::string const & str = ""); + + /* State info */ + + /// Returns true if a info has been succesfully loaded or anything has been manually set + bool has_info () const { return _has_info; } + +protected: + + SF_BROADCAST_INFO * info; + struct tm _time; + + void update_error (); + std::string error; + + bool _has_info; +}; + +} // namespace AudioGrapher + +#endif /* AUDIOGRAPHER_BROADCAST_INFO_H */ diff --git a/libs/audiographer/audiographer/sndfile/sndfile_writer.h b/libs/audiographer/audiographer/sndfile/sndfile_writer.h index 38e1b8148c..a6f338487a 100644 --- a/libs/audiographer/audiographer/sndfile/sndfile_writer.h +++ b/libs/audiographer/audiographer/sndfile/sndfile_writer.h @@ -9,6 +9,7 @@ #include "audiographer/sink.h" #include "audiographer/types.h" #include "audiographer/sndfile/sndfile_base.h" +#include "audiographer/broadcast_info.h" #include "pbd/signals.h" @@ -26,11 +27,15 @@ class SndfileWriter , public FlagDebuggable<> { public: - SndfileWriter (std::string const & path, int format, ChannelCount channels, nframes_t samplerate) + SndfileWriter (std::string const & path, int format, ChannelCount channels, nframes_t samplerate, boost::shared_ptr<BroadcastInfo> broadcast_info) : SndfileHandle (path, Write, format, channels, samplerate) , path (path) { add_supported_flag (ProcessContext<T>::EndOfInput); + + if (broadcast_info) { + broadcast_info->write_to_file (this); + } } virtual ~SndfileWriter () {} @@ -79,4 +84,4 @@ class SndfileWriter } // namespace -#endif // AUDIOGRAPHER_SNDFILE_WRITER_H
\ No newline at end of file +#endif // AUDIOGRAPHER_SNDFILE_WRITER_H |