mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-30 18:37:40 +01:00
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
This commit is contained in:
parent
8c4ce1e2ce
commit
bb9cc45cd2
730 changed files with 14946 additions and 14948 deletions
|
|
@ -48,7 +48,7 @@ class ExportChannelSelector : public Gtk::HBox
|
|||
protected:
|
||||
typedef boost::shared_ptr<ARDOUR::ExportChannelConfiguration> ChannelConfigPtr;
|
||||
typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
|
||||
|
||||
|
||||
ARDOUR::Session * session;
|
||||
ProfileManagerPtr manager;
|
||||
|
||||
|
|
@ -59,9 +59,9 @@ class ExportChannelSelector : public Gtk::HBox
|
|||
{}
|
||||
|
||||
virtual ~ExportChannelSelector () {}
|
||||
|
||||
|
||||
virtual void sync_with_manager () = 0;
|
||||
|
||||
|
||||
sigc::signal<void> CriticalSelectionChanged;
|
||||
};
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ class PortExportChannelSelector : public ExportChannelSelector
|
|||
|
||||
PortExportChannelSelector (ARDOUR::Session * session, ProfileManagerPtr manager);
|
||||
~PortExportChannelSelector ();
|
||||
|
||||
|
||||
void sync_with_manager ();
|
||||
|
||||
private:
|
||||
|
|
@ -93,101 +93,101 @@ class PortExportChannelSelector : public ExportChannelSelector
|
|||
Gtk::Label channels_label;
|
||||
Gtk::SpinButton channels_spinbutton;
|
||||
Gtk::CheckButton split_checkbox;
|
||||
|
||||
|
||||
/* Column record for channel selector view */
|
||||
|
||||
|
||||
class RouteCols : public Gtk::TreeModelColumnRecord
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
struct Channel;
|
||||
|
||||
|
||||
RouteCols () : n_channels (0)
|
||||
{ add (selected); add (name); add (io); add (port_list_col); }
|
||||
|
||||
|
||||
void add_channels (uint32_t chans);
|
||||
uint32_t n_channels;
|
||||
|
||||
|
||||
/* Channel count starts from one! */
|
||||
|
||||
|
||||
Channel & get_channel (uint32_t channel);
|
||||
|
||||
|
||||
/* Static columns */
|
||||
|
||||
|
||||
Gtk::TreeModelColumn<bool> selected;
|
||||
Gtk::TreeModelColumn<Glib::ustring> name;
|
||||
Gtk::TreeModelColumn<ARDOUR::IO *> io;
|
||||
|
||||
|
||||
/* Combo list column (shared by all channels) */
|
||||
|
||||
|
||||
typedef Gtk::TreeModelColumn<Glib::RefPtr<Gtk::ListStore> > ComboCol;
|
||||
ComboCol port_list_col;
|
||||
|
||||
|
||||
/* Channel struct, that represents the selected port and it's name */
|
||||
|
||||
|
||||
struct Channel {
|
||||
public:
|
||||
Channel (RouteCols & cols) { cols.add (port); cols.add (label); }
|
||||
|
||||
|
||||
Gtk::TreeModelColumn<ARDOUR::AudioPort *> port;
|
||||
Gtk::TreeModelColumn<Glib::ustring> label;
|
||||
};
|
||||
std::list<Channel> channels;
|
||||
|
||||
|
||||
/* List of available ports
|
||||
* Note: We need only one list of selectable ports per route,
|
||||
* so the list is kept in the column record
|
||||
*/
|
||||
|
||||
|
||||
/* Column record for selecting ports for a channel from a route */
|
||||
|
||||
|
||||
class PortCols : public Gtk::TreeModel::ColumnRecord
|
||||
{
|
||||
public:
|
||||
PortCols () { add (selected); add(port); add(label); }
|
||||
|
||||
|
||||
Gtk::TreeModelColumn<bool> selected; // not used ATM
|
||||
Gtk::TreeModelColumn<ARDOUR::AudioPort *> port;
|
||||
Gtk::TreeModelColumn<Glib::ustring> label;
|
||||
};
|
||||
PortCols port_cols;
|
||||
};
|
||||
|
||||
|
||||
/* Channels view */
|
||||
|
||||
|
||||
class ChannelTreeView : public Gtk::TreeView {
|
||||
public:
|
||||
|
||||
|
||||
ChannelTreeView (uint32_t max_channels);
|
||||
void set_config (ChannelConfigPtr c);
|
||||
|
||||
|
||||
/* Routes have to be added before adding channels */
|
||||
|
||||
|
||||
void clear_routes () { route_list->clear (); }
|
||||
void add_route (ARDOUR::IO * route);
|
||||
void set_channel_count (uint32_t channels);
|
||||
|
||||
|
||||
sigc::signal<void> CriticalSelectionChanged;
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
ChannelConfigPtr config;
|
||||
void update_config ();
|
||||
|
||||
|
||||
/* Signal handlers for selections changes in the view */
|
||||
|
||||
|
||||
void update_toggle_selection (Glib::ustring const & path);
|
||||
void update_selection_text (Glib::ustring const & path, Glib::ustring const & new_text, uint32_t channel);
|
||||
|
||||
|
||||
RouteCols route_cols;
|
||||
Glib::RefPtr<Gtk::ListStore> route_list;
|
||||
|
||||
|
||||
uint32_t static_columns;
|
||||
uint32_t n_channels;
|
||||
};
|
||||
|
||||
|
||||
uint32_t max_channels;
|
||||
|
||||
|
||||
Gtk::ScrolledWindow channel_scroller;
|
||||
Gtk::Alignment channel_alignment;
|
||||
ChannelTreeView channel_view;
|
||||
|
|
@ -201,7 +201,7 @@ class RegionExportChannelSelector : public ExportChannelSelector
|
|||
ProfileManagerPtr manager,
|
||||
ARDOUR::AudioRegion const & region,
|
||||
ARDOUR::AudioTrack & track);
|
||||
|
||||
|
||||
virtual void sync_with_manager ();
|
||||
|
||||
private:
|
||||
|
|
@ -212,14 +212,14 @@ class RegionExportChannelSelector : public ExportChannelSelector
|
|||
boost::shared_ptr<ARDOUR::RegionExportChannelFactory> factory;
|
||||
ARDOUR::AudioRegion const & region;
|
||||
ARDOUR::AudioTrack & track;
|
||||
|
||||
|
||||
uint32_t region_chans;
|
||||
uint32_t track_chans;
|
||||
|
||||
|
||||
/*** GUI components ***/
|
||||
|
||||
|
||||
Gtk::VBox vbox;
|
||||
|
||||
|
||||
Gtk::RadioButtonGroup type_group;
|
||||
Gtk::RadioButton raw_button;
|
||||
Gtk::RadioButton fades_button;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue