diff options
author | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
commit | bb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch) | |
tree | e52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/ardour/ardour/export_handler.h | |
parent | 8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff) |
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
Diffstat (limited to 'libs/ardour/ardour/export_handler.h')
-rw-r--r-- | libs/ardour/ardour/export_handler.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h index c945070408..b222c04eb4 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -71,27 +71,27 @@ class ExportElementFactory class ExportHandler : public ExportElementFactory, public sigc::trackable { private: - + /* Stuff for export configs * The multimap maps timespans to file specifications */ - + struct FileSpec { - + FileSpec (ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename) : channel_config (channel_config), format (format), filename (filename) {} - + ChannelConfigPtr channel_config; FormatPtr format; FilenamePtr filename; }; - + typedef std::pair<TimespanPtr, FileSpec> ConfigPair; typedef std::multimap<TimespanPtr, FileSpec> ConfigMap; - + typedef boost::shared_ptr<ExportProcessor> ProcessorPtr; typedef boost::shared_ptr<ExportStatus> StatusPtr; @@ -102,7 +102,7 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable friend boost::shared_ptr<ExportHandler> Session::get_export_handler(); ExportHandler (Session & session); - + public: ~ExportHandler (); @@ -115,62 +115,62 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable ProcessorPtr processor; StatusPtr export_status; ConfigMap config_map; - + bool realtime; - + sigc::connection files_written_connection; std::list<Glib::ustring> files_written; - + /* CD Marker stuff */ - + struct CDMarkerStatus { CDMarkerStatus (std::string out_file, TimespanPtr timespan, FormatPtr format, std::string filename) : out (out_file.c_str()), timespan (timespan), format (format), filename (filename), track_number (1), track_position (0), track_duration (0), track_start_frame (0), index_number (1), index_position (0) {} - + /* General info */ std::ofstream out; TimespanPtr timespan; FormatPtr format; std::string filename; Location * marker; - + /* Track info */ uint32_t track_number; nframes_t track_position; nframes_t track_duration; nframes_t track_start_frame; - + /* Index info */ uint32_t index_number; nframes_t index_position; }; - - + + void export_cd_marker_file (TimespanPtr timespan, FormatPtr file_format, std::string filename, CDMarkerFormat format); - + void write_cue_header (CDMarkerStatus & status); void write_toc_header (CDMarkerStatus & status); - + void write_track_info_cue (CDMarkerStatus & status); void write_track_info_toc (CDMarkerStatus & status); void write_index_info_cue (CDMarkerStatus & status); void write_index_info_toc (CDMarkerStatus & status); - + void frames_to_cd_frames_string (char* buf, nframes_t when); - + int cue_tracknum; int cue_indexnum; - + /* Timespan management */ - + void start_timespan (); void finish_timespan (); void timespan_thread_finished (); - + typedef std::pair<ConfigMap::iterator, ConfigMap::iterator> TimespanBounds; TimespanPtr current_timespan; ConfigMap::iterator current_map_it; |