From 046f8026628a52adeb6983948e39b2665f4c0b49 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 21 Oct 2009 16:56:58 +0000 Subject: Fix unnecessarily type specific code, tidy, fix whitespace. git-svn-id: svn://localhost/ardour2/branches/3.0@5844 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/add_route_dialog.cc | 11 +++-------- gtk2_ardour/audio_region_view.cc | 14 +++++++------- gtk2_ardour/editor_export_audio.cc | 10 ++++++++-- gtk2_ardour/editor_ops.cc | 8 ++------ gtk2_ardour/editor_regions.cc | 4 ++-- gtk2_ardour/plugin_ui.h | 22 +++++++++++----------- gtk2_ardour/tempo_lines.cc | 8 ++++---- 7 files changed, 37 insertions(+), 40 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 4ac34fa637..4c8c832044 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -193,14 +193,9 @@ AddRouteDialog::track () ARDOUR::DataType AddRouteDialog::type () { - // FIXME: ew - - const string str = channel_combo.get_active_text(); - if (str == _("MIDI")) { - return ARDOUR::DataType::MIDI; - } else { - return ARDOUR::DataType::AUDIO; - } + return (channel_combo.get_active_text() == _("MIDI")) + ? ARDOUR::DataType::MIDI + : ARDOUR::DataType::AUDIO; } string diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 2a97225434..4ca50c241d 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -200,9 +200,9 @@ AudioRegionView::init (Gdk::Color const & basic_color, bool wfd) setup_fade_handle_positions (); - if (!trackview.session().config.get_show_region_fades()) { - set_fade_visibility (false); - } + if (!trackview.session().config.get_show_region_fades()) { + set_fade_visibility (false); + } const string line_name = _region->name() + ":gain"; @@ -381,18 +381,18 @@ AudioRegionView::region_resized (Change what_changed) if (what_changed & Change (StartChanged|LengthChanged)) { - for (uint32_t n = 0; n < waves.size(); ++n) { - waves[n]->property_region_start() = _region->start(); + for (uint32_t n = 0; n < waves.size(); ++n) { + waves[n]->property_region_start() = _region->start(); } - for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { if((agr = dynamic_cast(*i)) != 0) { for (vector::iterator w = agr->waves.begin(); w != agr->waves.end(); ++w) { (*w)->property_region_start() = _region->start(); } } - } + } } } diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 82b98c7650..851a045f0d 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -31,6 +31,7 @@ #include "time_axis_view.h" #include "audio_time_axis.h" #include "audio_region_view.h" +#include "midi_region_view.h" #include "pbd/pthread_utils.h" #include "ardour/types.h" @@ -116,11 +117,16 @@ int Editor::write_region_selection (RegionSelection& regions) { for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { - // FIXME AudioRegionView* arv = dynamic_cast(*i); - if (arv) + if (arv) { if (write_region ("", arv->audio_region()) == false) return -1; + } + + MidiRegionView* mrv = dynamic_cast(*i); + if (mrv) { + warning << "MIDI region export not implemented" << endmsg; + } } return 0; diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index a727e1610a..7f5907dec6 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3087,10 +3087,6 @@ Editor::region_fill_track () boost::shared_ptr region ((*i)->region()); - // FIXME - boost::shared_ptr ar = boost::dynamic_pointer_cast(region); - assert(ar); - boost::shared_ptr pl = region->playlist(); if (end <= region->last_frame()) { @@ -3104,7 +3100,7 @@ Editor::region_fill_track () } XMLNode &before = pl->get_state(); - pl->add_region (RegionFactory::create (ar), ar->last_frame(), times); + pl->add_region (RegionFactory::create (region), region->last_frame(), times); session->add_command (new MementoCommand(*pl, &before, &pl->get_state())); } @@ -3114,7 +3110,7 @@ Editor::region_fill_track () void Editor::region_fill_selection () { - if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { + if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { return; } diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index b763a0bbdf..91cde8fcbb 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -617,8 +617,8 @@ EditorRegions::populate_row (boost::shared_ptr region, TreeModel::Row co char fadeout_str[16]; char used_str[8]; int used; - BBT_Time bbt; // FIXME Why do these have to be declared here ? - SMPTE::Time smpte; // FIXME I would like them declared in the case statment where they are used. + BBT_Time bbt; + SMPTE::Time smpte; bool missing_source = boost::dynamic_pointer_cast(region->source()); diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index a80a3971df..f27e40f3d5 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -185,16 +185,16 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox /* input */ - Gtk::ComboBoxText* combo; - std::map* combo_map; - Gtk::ToggleButton* button; - boost::shared_ptr controller; - Gtkmm2ext::ClickBox* clickbox; - Gtk::Label label; - bool logarithmic; - bool update_pending; - char ignore_change; - Gtk::Button automate_button; + Gtk::ComboBoxText* combo; + std::map* combo_map; + Gtk::ToggleButton* button; + boost::shared_ptr controller; + Gtkmm2ext::ClickBox* clickbox; + Gtk::Label label; + bool logarithmic; + bool update_pending; + char ignore_change; + Gtk::Button automate_button; /* output */ @@ -243,7 +243,7 @@ class PluginUIWindow : public Gtk::Window void resize_preferred(); void set_parent (Gtk::Window*); - void set_title(const Glib::ustring& title); + void set_title(const Glib::ustring& title); bool on_enter_notify_event (GdkEventCrossing*); diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index e9bd4bbc49..aa8b48fc2b 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -46,8 +46,8 @@ TempoLines::tempo_map_changed() for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++d) { Lines::iterator next = i; ++next; - i->second->property_x1() = - d; - i->second->property_x2() = - d; + i->second->property_x1() = - d; + i->second->property_x2() = - d; _lines.erase(i); _lines.insert(make_pair(- d, i->second)); i = next; @@ -58,7 +58,7 @@ void TempoLines::show () { for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) { - i->second->show(); + i->second->show(); } } @@ -66,7 +66,7 @@ void TempoLines::hide () { for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) { - i->second->hide(); + i->second->hide(); } } -- cgit v1.2.3