diff options
author | David Robillard <d@drobilla.net> | 2007-05-10 03:50:17 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-05-10 03:50:17 +0000 |
commit | 9a4a9cbb63958484553ed981822ca97ceb1dc4f5 (patch) | |
tree | 6888079450c5ba74d195732fafc99de8d8531c36 /gtk2_ardour | |
parent | 2a52135c663e9a60b5f0cc9cc6673799c3ea5549 (diff) |
Added nicer looking wrapper methods for ChanCount::get(DataType), sedified code to use it.
git-svn-id: svn://localhost/ardour2/trunk@1816 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/audio_streamview.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_export_audio.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/export_dialog.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/gain_meter.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/midi_streamview.cc | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index de006a8fec..a38196d642 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2397,7 +2397,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window) AutoConnectOption oac = Config->get_output_auto_connect(); if (oac & AutoConnectMaster) { - output_chan = (session->master_out() ? session->master_out()->n_inputs().get(DataType::AUDIO) : input_chan); + output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan); } else { output_chan = input_chan; } diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 18e48921c8..170a421ad5 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -784,7 +784,7 @@ AudioRegionView::create_waves () return; } - uint32_t nchans = atv.get_diskstream()->n_channels().get(DataType::AUDIO); + uint32_t nchans = atv.get_diskstream()->n_channels().n_audio(); /* in tmp_waves, set up null pointers for each channel so the vector is allocated */ for (uint32_t n = 0; n < nchans; ++n) { @@ -814,7 +814,7 @@ void AudioRegionView::create_one_wave (uint32_t which, bool direct) { RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick - uint32_t nchans = atv.get_diskstream()->n_channels().get(DataType::AUDIO); + uint32_t nchans = atv.get_diskstream()->n_channels().n_audio(); uint32_t n; uint32_t nwaves = std::min (nchans, audio_region()->n_channels()); gdouble ht; @@ -1069,7 +1069,7 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv) GhostRegion* ghost = new GhostRegion (atv, unit_position); uint32_t nchans; - nchans = rtv->get_diskstream()->n_channels().get(DataType::AUDIO); + nchans = rtv->get_diskstream()->n_channels().n_audio(); for (uint32_t n = 0; n < nchans; ++n) { diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 398b9c404b..db7b07dfb2 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -482,7 +482,7 @@ AudioStreamView::setup_rec_box () boost::shared_ptr<AudioDiskstream> ads = boost::dynamic_pointer_cast<AudioDiskstream>(_trackview.get_diskstream()); assert(ads); - for (uint32_t n=0; n < ads->n_channels().get(DataType::AUDIO); ++n) { + for (uint32_t n=0; n < ads->n_channels().n_audio(); ++n) { boost::shared_ptr<AudioFileSource> src = boost::static_pointer_cast<AudioFileSource> (ads->write_source (n)); if (src) { sources.push_back (src); @@ -638,7 +638,7 @@ AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::we rec_data_ready_map[src] = true; - if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().get(DataType::AUDIO)) { + if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_audio()) { this->update_rec_regions (); rec_data_ready_map.clear(); } diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 5e0728b05a..414329f145 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -434,7 +434,7 @@ AudioTimeAxisView::update_pans () /* we don't draw lines for "greater than stereo" panning. */ - if (_route->n_outputs().get(DataType::AUDIO) > 2) { + if (_route->n_outputs().n_audio() > 2) { return; } diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index a933197f7f..2eb8b9140a 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -436,7 +436,7 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External))); if (Config->get_output_auto_connect() & AutoConnectMaster) { - output_chan = (session->master_out() ? session->master_out()->n_inputs().get(DataType::AUDIO) : input_chan); + output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan); } else { output_chan = input_chan; } diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 10438bfb02..75f355f668 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -316,7 +316,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list string path; vector<boost::shared_ptr<AudioFileSource> > sources; - uint32_t channels = count.get(DataType::AUDIO); + uint32_t channels = count.n_audio(); for (uint32_t n=0; n < channels; ++n) { diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index 27bc80a6bd..0707dd8230 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -494,7 +494,7 @@ ExportDialog::set_state() } TreeModel::Children rows = master_selector.get_model()->children(); - for (uint32_t r = 0; r < session->master_out()->n_outputs().get(DataType::AUDIO); ++r) { + for (uint32_t r = 0; r < session->master_out()->n_outputs().n_audio(); ++r) { if (nchns == 2) { if (r % 2) { rows[r][exp_cols.right] = true; @@ -1096,9 +1096,9 @@ ExportDialog::fill_lists () continue; } - for (uint32_t i=0; i < route->n_outputs().get(DataType::AUDIO); ++i) { + for (uint32_t i=0; i < route->n_outputs().n_audio(); ++i) { string name; - if (route->n_outputs().get(DataType::AUDIO) == 1) { + if (route->n_outputs().n_audio() == 1) { name = route->name(); } else { name = string_compose("%1: out-%2", route->name(), i+1); diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 303bbcb1a9..5f4afe538a 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -389,7 +389,7 @@ GainMeter::hide_all_meters () void GainMeter::setup_meters () { - uint32_t nmeters = _io->n_outputs().get(DataType::AUDIO); + uint32_t nmeters = _io->n_outputs().n_audio(); guint16 width; hide_all_meters (); @@ -401,16 +401,16 @@ GainMeter::setup_meters () switch (r->meter_point()) { case MeterPreFader: case MeterInput: - nmeters = r->n_inputs().get(DataType::AUDIO); + nmeters = r->n_inputs().n_audio(); break; case MeterPostFader: - nmeters = r->n_outputs().get(DataType::AUDIO); + nmeters = r->n_outputs().n_audio(); break; } } else { - nmeters = _io->n_outputs().get(DataType::AUDIO); + nmeters = _io->n_outputs().n_audio(); } diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 1b3879024a..47fae246e0 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -378,7 +378,7 @@ MidiStreamView::rec_data_range_ready (jack_nframes_t start, jack_nframes_t cnt, rec_data_ready_map[src] = true; - if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().get(DataType::MIDI)) { + if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_midi()) { this->update_rec_regions (); rec_data_ready_map.clear(); } |