NO-OP: whitespace

This commit is contained in:
Robin Gareus 2019-10-15 22:47:57 +02:00
parent 4bf079810f
commit 6da5f96cf6
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 50 additions and 42 deletions

View File

@ -26,9 +26,8 @@
#include "audio_clock.h"
#include <list>
#include <ctime>
#include <list>
#ifdef interface
#undef interface
@ -46,9 +45,9 @@
#include <gtkmm/treestore.h>
#include <gtkmm/treeview.h>
#include "ardour/types.h"
#include "ardour/session_handle.h"
#include "ardour/export_profile_manager.h"
#include "ardour/session_handle.h"
#include "ardour/types.h"
namespace ARDOUR {
class Location;
@ -63,17 +62,16 @@ using ARDOUR::samplecnt_t;
class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
{
protected:
typedef std::list<ARDOUR::Location *> LocationList;
typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef std::list<ARDOUR::Location*> LocationList;
typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
typedef std::list<ARDOUR::ExportTimespanPtr> TimespanList;
typedef boost::shared_ptr<TimespanList> TimespanListPtr;
typedef std::list<ARDOUR::ExportTimespanPtr> TimespanList;
typedef boost::shared_ptr<TimespanList> TimespanListPtr;
typedef ARDOUR::ExportProfileManager::TimespanStatePtr TimespanStatePtr;
public:
ExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager, bool multi);
ExportTimespanSelector (ARDOUR::Session* session, ProfileManagerPtr manager, bool multi);
virtual ~ExportTimespanSelector ();
@ -83,30 +81,29 @@ public:
sigc::signal<void> CriticalSelectionChanged;
protected:
ProfileManagerPtr manager;
TimespanStatePtr state;
bool _realtime_available;
bool _realtime_available;
virtual void fill_range_list () = 0;
virtual void fill_range_list () = 0;
virtual void update_timespans () = 0;
void add_range_to_selection (ARDOUR::Location const * loc, bool rt);
void add_range_to_selection (ARDOUR::Location const* loc, bool rt);
void set_time_format_from_state ();
void toggle_realtime ();
void change_time_format ();
std::string construct_label (ARDOUR::Location const * location) const;
std::string construct_length (ARDOUR::Location const * location) const;
std::string construct_label (ARDOUR::Location const* location) const;
std::string construct_length (ARDOUR::Location const* location) const;
std::string bbt_str (samplepos_t samples) const;
std::string timecode_str (samplecnt_t samples) const;
std::string ms_str (samplecnt_t samples) const;
void update_range_name (std::string const & path, std::string const & new_text);
void update_range_name (std::string const& path, std::string const& new_text);
void set_selection_state_of_all_timespans (bool);
int location_sorter(Gtk::TreeModel::iterator a, Gtk::TreeModel::iterator b);
int location_sorter (Gtk::TreeModel::iterator a, Gtk::TreeModel::iterator b);
/*** GUI components ***/
@ -118,13 +115,16 @@ protected:
typedef ARDOUR::ExportProfileManager::TimeFormat TimeFormat;
struct TimeFormatCols : public Gtk::TreeModelColumnRecord
{
struct TimeFormatCols : public Gtk::TreeModelColumnRecord {
public:
Gtk::TreeModelColumn<TimeFormat> format;
Gtk::TreeModelColumn<std::string> label;
Gtk::TreeModelColumn<TimeFormat> format;
Gtk::TreeModelColumn<std::string> label;
TimeFormatCols () { add(format); add(label); }
TimeFormatCols ()
{
add (format);
add (label);
}
};
TimeFormatCols time_format_cols;
Glib::RefPtr<Gtk::ListStore> time_format_list;
@ -132,40 +132,50 @@ protected:
/* View */
struct RangeCols : public Gtk::TreeModelColumnRecord
{
struct RangeCols : public Gtk::TreeModelColumnRecord {
public:
Gtk::TreeModelColumn<ARDOUR::Location *> location;
Gtk::TreeModelColumn<std::string> label;
Gtk::TreeModelColumn<bool> selected;
Gtk::TreeModelColumn<bool> realtime;
Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<std::string> length;
Gtk::TreeModelColumn<std::string> date;
Gtk::TreeModelColumn<time_t> timestamp;
Gtk::TreeModelColumn<ARDOUR::Location*> location;
Gtk::TreeModelColumn<std::string> label;
Gtk::TreeModelColumn<bool> selected;
Gtk::TreeModelColumn<bool> realtime;
Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<std::string> length;
Gtk::TreeModelColumn<std::string> date;
Gtk::TreeModelColumn<time_t> timestamp;
Gtk::TreeModelColumn<ARDOUR::samplecnt_t> length_actual;
Gtk::TreeModelColumn<ARDOUR::samplecnt_t> start;
RangeCols () { add (location); add(label); add(selected); add(realtime); add(name); add(length); add(date); add(timestamp); add(length_actual); add(start);}
RangeCols ()
{
add (location);
add (label);
add (selected);
add (realtime);
add (name);
add (length);
add (date);
add (timestamp);
add (length_actual);
add (start);
}
};
RangeCols range_cols;
RangeCols range_cols;
Glib::RefPtr<Gtk::ListStore> range_list;
Gtk::TreeView range_view;
Gtk::ScrolledWindow range_scroller;
Gtk::ScrolledWindow range_scroller;
};
/// Allows selecting multiple timespans
class ExportTimespanSelectorMultiple : public ExportTimespanSelector
{
public:
ExportTimespanSelectorMultiple (ARDOUR::Session * session, ProfileManagerPtr manager);
ExportTimespanSelectorMultiple (ARDOUR::Session* session, ProfileManagerPtr manager);
void allow_realtime_export (bool);
private:
virtual void fill_range_list ();
void set_selection_from_state ();
@ -177,17 +187,15 @@ private:
class ExportTimespanSelectorSingle : public ExportTimespanSelector
{
public:
ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id);
ExportTimespanSelectorSingle (ARDOUR::Session* session, ProfileManagerPtr manager, std::string range_id);
void allow_realtime_export (bool);
private:
virtual void fill_range_list ();
void update_timespans ();
void update_timespans ();
std::string range_id;
};
#endif /* __export_timespan_selector_h__ */