diff options
Diffstat (limited to 'gtk2_ardour')
30 files changed, 50 insertions, 48 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index a5dafd6757..1130177fe2 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3796,7 +3796,7 @@ ARDOUR_UI::missing_file (Session*s, std::string str, DataType type) } int -ARDOUR_UI::ambiguous_file (std::string file, std::string path, std::vector<std::string> hits) +ARDOUR_UI::ambiguous_file (std::string file, std::string /*path*/, std::vector<std::string> hits) { AmbiguousFileDialog dialog (file, hits); diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index b288961d71..08e0d42ab0 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -707,10 +707,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void step_edit_status_change (bool); + void platform_specific (); + void platform_setup (); + /* these are used only in response to a platform-specific "ShouldQuit" signal */ bool idle_finish (); void queue_finish (); + void fontconfig_dialog (); std::list<WindowProxyBase*> _window_proxies; diff --git a/gtk2_ardour/au_pluginui.mm b/gtk2_ardour/au_pluginui.mm index 0f10af054d..256ceca7b0 100644 --- a/gtk2_ardour/au_pluginui.mm +++ b/gtk2_ardour/au_pluginui.mm @@ -131,7 +131,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert) smaller_hbox->set_spacing (6); smaller_hbox->pack_start (preset_label, false, false, 4); - smaller_hbox->pack_start (preset_combo, false, false); + smaller_hbox->pack_start (_preset_combo, false, false); smaller_hbox->pack_start (save_button, false, false); #if 0 /* one day these might be useful with an AU plugin, but not yet */ @@ -158,7 +158,7 @@ AUPluginUI::AUPluginUI (boost::shared_ptr<PluginInsert> insert) pack_start (low_box, false, false); preset_label.show (); - preset_combo.show (); + _preset_combo.show (); automation_mode_label.show (); automation_mode_selector.show (); bypass_button.show (); @@ -276,7 +276,7 @@ AUPluginUI::create_cocoa_view () UInt32 dataSize; Boolean isWritable; NSString* factoryClassName = 0; - NSURL* CocoaViewBundlePath; + NSURL* CocoaViewBundlePath = NULL; OSStatus result = AudioUnitGetPropertyInfo (*au->get_au(), kAudioUnitProperty_CocoaUI, diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 3adb17ab84..aff72fbf6e 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1006,7 +1006,7 @@ AudioClock::button_press (GdkEventButton *ev, CairoCell* cell) } bool -AudioClock::button_release (GdkEventButton *ev, CairoCell* cell) +AudioClock::button_release (GdkEventButton *ev, CairoCell*) { if (editable) { if (dragging) { diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index b0767604c9..e06e50f113 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -96,10 +96,9 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion> AudioRegionEditor::~AudioRegionEditor () { - pthread_cancel_one (_peak_amplitude_thread_handle); void* v; - int const r = pthread_join (_peak_amplitude_thread_handle, &v); - assert (r == 0); + pthread_cancel_one (_peak_amplitude_thread_handle); + pthread_join (_peak_amplitude_thread_handle, &v); } void diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index e4daf6e74c..4ba09120ad 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -955,7 +955,7 @@ AutomationTimeAxisView::set_state_2X (const XMLNode& node, int /*version*/) } int -AutomationTimeAxisView::set_state (const XMLNode& node, int /*version*/) +AutomationTimeAxisView::set_state (const XMLNode&, int /*version*/) { return 0; } diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c index 887f71b411..39a1901f57 100644 --- a/gtk2_ardour/canvas-simpleline.c +++ b/gtk2_ardour/canvas-simpleline.c @@ -389,7 +389,7 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item, } static void -gnome_canvas_simpleline_draw (GnomeCanvasItem *item, +gnome_canvas_simpleline_draw (GnomeCanvasItem *canvas, GdkDrawable *drawable, int x, int y, int width, int height) @@ -414,7 +414,6 @@ gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx (void) cx; (void) cy; - GnomeCanvasSimpleLine *simpleline; double x1, y1, x2, y2; double dx, dy; diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 1677baa001..da928a6d9e 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -890,7 +890,7 @@ Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save) } bool -Editor::track_canvas_key_press (GdkEventKey* event) +Editor::track_canvas_key_press (GdkEventKey*) { /* XXX: event does not report the modifier key pressed down, AFAICS, so use the Keyboard object instead */ if (mouse_mode == Editing::MouseZoom && Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { @@ -901,7 +901,7 @@ Editor::track_canvas_key_press (GdkEventKey* event) } bool -Editor::track_canvas_key_release (GdkEventKey* event) +Editor::track_canvas_key_release (GdkEventKey*) { if (mouse_mode == Editing::MouseZoom && !Keyboard::the_keyboard().key_is_down (GDK_Control_L)) { set_canvas_cursor (_cursors->zoom_in, true); diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 014c925f7d..07ae84031f 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -1084,7 +1084,7 @@ Editor::track_canvas_drag_motion (Glib::RefPtr<Gdk::DragContext> const & /*c*/, } bool -Editor::key_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType type) +Editor::key_press_handler (ArdourCanvas::Item*, GdkEvent*, ItemType) { return false; } diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 34e7750963..04dedf97ad 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -2736,7 +2736,7 @@ MarkerDrag::aborted (bool) } void -MarkerDrag::update_item (Location* location) +MarkerDrag::update_item (Location*) { /* noop */ } diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 9df6de3a8e..21f2214a7c 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1806,7 +1806,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_ } bool -Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type) +Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent*, ItemType item_type) { AutomationLine* al; ControlPoint* cp; @@ -2417,7 +2417,7 @@ Editor::track_height_step_timeout () } void -Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2439,7 +2439,7 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* } void -Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2454,7 +2454,7 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionV } void -Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent* event, RegionView* region_view) +Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region_view) { assert (region_view); @@ -2584,7 +2584,7 @@ Editor::set_internal_edit (bool yn) * used by the `join object/range' tool mode. */ void -Editor::update_join_object_range_location (double x, double y) +Editor::update_join_object_range_location (double /*x*/, double y) { /* XXX: actually, this decides based on whether the mouse is in the top or bottom half of a RouteTimeAxisView; entered_{track,regionview} is not always setup (e.g. if the mouse is over a TimeSelection), and to get a Region diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index b19dd6af77..554fffa69c 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -5006,7 +5006,7 @@ void Editor::toggle_region_fades (int dir) { boost::shared_ptr<AudioRegion> ar; - bool yn; + bool yn = false; RegionSelection rs = get_regions_from_selection_and_entered (); diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 154af6c977..c6c8f1e914 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -214,7 +214,7 @@ EditorRegions::focus_out (GdkEventFocus*) } bool -EditorRegions::enter_notify (GdkEventCrossing* ev) +EditorRegions::enter_notify (GdkEventCrossing*) { if (name_editable) { return true; @@ -743,7 +743,7 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co #endif void -EditorRegions::populate_row_used (boost::shared_ptr<Region> region, TreeModel::Row const& row, uint32_t used) +EditorRegions::populate_row_used (boost::shared_ptr<Region>, TreeModel::Row const& row, uint32_t used) { char buf[8]; snprintf (buf, sizeof (buf), "%4d" , used); diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 1c077e8552..b7a3f2ba5f 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1746,7 +1746,7 @@ Editor::set_samples_ruler_scale (framepos_t lower, framepos_t upper) } gint -Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble upper, gint /*maxchars*/) +Editor::metric_get_samples (GtkCustomRulerMark **marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) { framepos_t pos; framepos_t const ilower = (framepos_t) floor (lower); diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index c2338347d2..b108659981 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1230,7 +1230,7 @@ Editor::select_all_in_track (Selection::Operation op) } void -Editor::select_all_internal_edit (Selection::Operation op) +Editor::select_all_internal_edit (Selection::Operation) { /* currently limited to MIDI only */ diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 471239efdc..79f5d4b421 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -634,7 +634,7 @@ GainMeterBase::gain_slider_button_press (GdkEventButton* ev) } bool -GainMeterBase::gain_slider_button_release (GdkEventButton* ev) +GainMeterBase::gain_slider_button_release (GdkEventButton*) { _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); return true; diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index e2f8e9905a..5c713f1352 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -603,7 +603,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg) } void -GroupTabs::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> w) +GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr<Route> w) { /* Similarly-spirited hack as in route_group_property_changed */ @@ -616,7 +616,7 @@ GroupTabs::route_added_to_route_group (RouteGroup* rg, boost::weak_ptr<Route> w) } void -GroupTabs::route_removed_from_route_group (RouteGroup* rg, boost::weak_ptr<Route> w) +GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w) { /* Similarly-spirited hack as in route_group_property_changed */ diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index 90405a6c31..7332299bfb 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -352,7 +352,7 @@ bind_keys_azerty(PianoKeyboard *pk) } static gint -keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer notused) +keyboard_event_handler(GtkWidget *mk, GdkEventKey *event, gpointer ignored) { int note; char *key; @@ -433,7 +433,7 @@ get_note_for_xy(PianoKeyboard *pk, int x, int y) } static gboolean -mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer notused) +mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer ignored) { int x = event->x; int y = event->y; @@ -473,7 +473,7 @@ mouse_button_event_handler(PianoKeyboard *pk, GdkEventButton *event, gpointer no } static gboolean -mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer notused) +mouse_motion_event_handler(PianoKeyboard *pk, GdkEventMotion *event, gpointer ignored) { int note; diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index c0f5d1f325..004bf9e765 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -593,7 +593,7 @@ LocationEditRow::preemph_toggled () } void -LocationEditRow::end_changed (ARDOUR::Location *loc) +LocationEditRow::end_changed (ARDOUR::Location *) { ENSURE_GUI_THREAD (*this, &LocationEditRow::end_changed, loc) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 69f6b87442..b79d97d746 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -388,7 +388,7 @@ MidiRegionView::enter_notify (GdkEventCrossing* ev) } bool -MidiRegionView::leave_notify (GdkEventCrossing* ev) +MidiRegionView::leave_notify (GdkEventCrossing*) { _mouse_mode_connection.disconnect (); @@ -850,7 +850,7 @@ void MidiRegionView::channel_edit () { bool first = true; - uint8_t current_channel; + uint8_t current_channel = 0; if (_selection.empty()) { return; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 7012ad61f5..15550f4cd4 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1880,7 +1880,7 @@ MixerStrip::hide_things () } bool -MixerStrip::input_active_button_press (GdkEventButton* ev) +MixerStrip::input_active_button_press (GdkEventButton*) { /* nothing happens on press */ return true; diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index de6685fade..1bdd27dc6d 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -762,7 +762,7 @@ MonitorSection::setup_knob_images () void MonitorSection::update_solo_model () { - const char* action_name; + const char* action_name = 0; Glib::RefPtr<Action> act; if (Config->get_solo_control_is_listen_control()) { diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 78fec4e679..43afcd5c84 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -121,7 +121,7 @@ MonoPanner::value_change () } bool -MonoPanner::on_expose_event (GdkEventExpose* ev) +MonoPanner::on_expose_event (GdkEventExpose*) { Glib::RefPtr<Gdk::Window> win (get_window()); Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state())); @@ -469,13 +469,13 @@ MonoPanner::on_key_press_event (GdkEventKey* ev) } bool -MonoPanner::on_key_release_event (GdkEventKey* ev) +MonoPanner::on_key_release_event (GdkEventKey*) { return false; } bool -MonoPanner::on_enter_notify_event (GdkEventCrossing* ev) +MonoPanner::on_enter_notify_event (GdkEventCrossing*) { grab_focus (); Keyboard::magic_widget_grab_focus (); diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index d61471d19e..ffe9a15954 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -853,7 +853,7 @@ Panner2dWindow::on_key_press_event (GdkEventKey* event) } bool -Panner2dWindow::on_key_release_event (GdkEventKey *event) +Panner2dWindow::on_key_release_event (GdkEventKey*) { return true; } diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 534c7ef0d6..f213bb89ea 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -224,7 +224,7 @@ RegionView::~RegionView () } void -RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold) +RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/) { framecnt_t shortest = max_framecnt; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 81b50f04b6..17c0874641 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1875,7 +1875,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> } void -RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor> i) +RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor>) { if (!_hidden) { pan->menu_item->set_active (false); @@ -2281,7 +2281,7 @@ RouteTimeAxisView::set_underlay_state() } void -RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml) +RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/) { if (!v) { return; diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc index dd7cd753e6..a496ddc0b2 100644 --- a/gtk2_ardour/shuttle_control.cc +++ b/gtk2_ardour/shuttle_control.cc @@ -483,7 +483,7 @@ ShuttleControl::use_shuttle_fract (bool force) } bool -ShuttleControl::on_expose_event (GdkEventExpose* event) +ShuttleControl::on_expose_event (GdkEventExpose*) { cairo_text_extents_t extents; Glib::RefPtr<Gdk::Window> win (get_window()); diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 7fe204fbfd..690acbfdda 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -619,13 +619,13 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) } bool -StereoPanner::on_key_release_event (GdkEventKey* ev) +StereoPanner::on_key_release_event (GdkEventKey*) { return false; } bool -StereoPanner::on_enter_notify_event (GdkEventCrossing* ev) +StereoPanner::on_enter_notify_event (GdkEventCrossing*) { grab_focus (); Keyboard::magic_widget_grab_focus (); diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 14cbecd808..4ed057add9 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -397,7 +397,7 @@ TimeAxisView::controls_ebox_motion (GdkEventMotion* ev) } bool -TimeAxisView::controls_ebox_leave (GdkEventCrossing* ev) +TimeAxisView::controls_ebox_leave (GdkEventCrossing*) { if (_have_preresize_cursor) { gdk_window_set_cursor (controls_ebox.get_window()->gobj(), _preresize_cursor); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index ce2e6c1485..d9b0bfa2cf 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -109,7 +109,7 @@ TimeAxisViewItem::TimeAxisViewItem( } TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) - : sigc::trackable(other) + : Selectable (other) , PBD::ScopedConnectionList() , trackview (other.trackview) , _recregion (other._recregion) |