summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc6
-rw-r--r--gtk2_ardour/ardour_ui_ed.cc2
-rw-r--r--gtk2_ardour/ardour_window.cc2
-rw-r--r--gtk2_ardour/audio_clock.cc12
-rw-r--r--gtk2_ardour/button_joiner.cc2
-rw-r--r--gtk2_ardour/canvas-simpleline.c4
-rw-r--r--gtk2_ardour/editor_drag.cc6
-rw-r--r--gtk2_ardour/editor_route_groups.cc4
-rw-r--r--gtk2_ardour/group_tabs.cc2
-rw-r--r--gtk2_ardour/gtk_pianokeyboard.c2
-rw-r--r--gtk2_ardour/plugin_selector.cc2
-rw-r--r--gtk2_ardour/port_matrix.cc4
-rw-r--r--gtk2_ardour/processor_box.cc2
-rw-r--r--gtk2_ardour/route_ui.cc4
-rw-r--r--gtk2_ardour/sfdb_freesound_mootcher.cc2
-rw-r--r--gtk2_ardour/shuttle_control.cc8
-rw-r--r--gtk2_ardour/stereo_panner.cc2
-rw-r--r--gtk2_ardour/tempo_dialog.cc8
18 files changed, 36 insertions, 38 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index e97745e946..8063164eb5 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -925,7 +925,7 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
if (!engine->connected()) {
- snprintf (buf, sizeof (buf), _("disconnected"));
+ snprintf (buf, sizeof (buf), "%s", _("disconnected"));
} else {
@@ -1063,7 +1063,7 @@ ARDOUR_UI::update_disk_space()
framecnt_t fr = _session->frame_rate();
if (frames == max_framecnt) {
- snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">24hrs+</span>"));
+ snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">24hrs+</span>"));
} else {
rec_enabled_streams = 0;
_session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
@@ -1079,7 +1079,7 @@ ARDOUR_UI::update_disk_space()
hrs = frames / (fr * 3600);
if (hrs > 24) {
- snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
+ snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">&gt;24 hrs</span>"));
} else {
frames -= hrs * fr * 3600;
mins = frames / (fr * 60);
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index f5ee554c3f..35100e940b 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -706,7 +706,7 @@ ARDOUR_UI::float_big_clock (Gtk::Window* parent)
}
void
-ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation& alloc)
+ARDOUR_UI::big_clock_size_allocate (Gtk::Allocation&)
{
if (!big_clock_resize_in_progress) {
Glib::signal_idle().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::idle_big_clock_text_resizer), 0, 0));
diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc
index 94d3f55d12..8d3821fe87 100644
--- a/gtk2_ardour/ardour_window.cc
+++ b/gtk2_ardour/ardour_window.cc
@@ -36,7 +36,7 @@ ArdourWindow::ArdourWindow (string title)
init ();
}
-ArdourWindow::ArdourWindow (Gtk::Window& parent, string title)
+ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
: Window ()
{
init ();
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index a4cb473a72..76abb9d6bb 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -796,7 +796,7 @@ AudioClock::parse_as_timecode_distance (const std::string& str)
}
framecnt_t
-AudioClock::parse_as_bbt_distance (const std::string& str)
+AudioClock::parse_as_bbt_distance (const std::string&)
{
return 0;
}
@@ -1001,7 +1001,7 @@ AudioClock::set_frames (framepos_t when, bool /*force*/)
}
void
-AudioClock::set_minsec (framepos_t when, bool force)
+AudioClock::set_minsec (framepos_t when, bool /*force*/)
{
char buf[32];
framecnt_t left;
@@ -1046,7 +1046,7 @@ AudioClock::set_minsec (framepos_t when, bool force)
}
void
-AudioClock::set_timecode (framepos_t when, bool force)
+AudioClock::set_timecode (framepos_t when, bool /*force*/)
{
char buf[32];
Timecode::Time TC;
@@ -1112,7 +1112,7 @@ AudioClock::set_timecode (framepos_t when, bool force)
}
void
-AudioClock::set_bbt (framepos_t when, bool force)
+AudioClock::set_bbt (framepos_t when, bool /*force*/)
{
char buf[16];
Timecode::BBT_Time BBT;
@@ -1740,7 +1740,7 @@ AudioClock::get_frame_step (Field field, framepos_t pos, int dir)
}
framepos_t
-AudioClock::current_time (framepos_t pos) const
+AudioClock::current_time (framepos_t) const
{
return last_when;
}
@@ -1795,7 +1795,7 @@ AudioClock::bbt_validate_edit (const string& str)
}
bool
-AudioClock::timecode_validate_edit (const string& str)
+AudioClock::timecode_validate_edit (const string&)
{
Timecode::Time TC;
diff --git a/gtk2_ardour/button_joiner.cc b/gtk2_ardour/button_joiner.cc
index 86bb055d01..085d5d30b2 100644
--- a/gtk2_ardour/button_joiner.cc
+++ b/gtk2_ardour/button_joiner.cc
@@ -138,7 +138,7 @@ ButtonJoiner::on_size_allocate (Allocation& alloc)
}
bool
-ButtonJoiner::on_button_release_event (GdkEventButton* ev)
+ButtonJoiner::on_button_release_event (GdkEventButton*)
{
if (_action) {
_action->activate ();
diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c
index 39a1901f57..efff5034f9 100644
--- a/gtk2_ardour/canvas-simpleline.c
+++ b/gtk2_ardour/canvas-simpleline.c
@@ -389,8 +389,8 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
}
static void
-gnome_canvas_simpleline_draw (GnomeCanvasItem *canvas,
- GdkDrawable *drawable,
+gnome_canvas_simpleline_draw (GnomeCanvasItem* canvas,
+ GdkDrawable* drawable,
int x, int y,
int width, int height)
{
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index c418e85018..7d10d0969c 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -4360,7 +4360,7 @@ MidiRubberbandSelectDrag::MidiRubberbandSelectDrag (Editor* e, MidiRegionView* r
}
void
-MidiRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress)
+MidiRubberbandSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool /*drag_in_progress*/)
{
framepos_t const p = _region_view->region()->position ();
double const y = _region_view->midi_view()->y_position ();
@@ -4393,7 +4393,7 @@ MidiVerticalSelectDrag::MidiVerticalSelectDrag (Editor* e, MidiRegionView* rv)
}
void
-MidiVerticalSelectDrag::select_things (int button_state, framepos_t x1, framepos_t x2, double y1, double y2, bool drag_in_progress)
+MidiVerticalSelectDrag::select_things (int button_state, framepos_t /*x1*/, framepos_t /*x2*/, double y1, double y2, bool /*drag_in_progress*/)
{
double const y = _region_view->midi_view()->y_position ();
@@ -4516,7 +4516,7 @@ NoteCreateDrag::motion (GdkEvent* event, bool)
}
void
-NoteCreateDrag::finished (GdkEvent* event, bool had_movement)
+NoteCreateDrag::finished (GdkEvent*, bool had_movement)
{
if (!had_movement) {
return;
diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 1b72425032..2fd08e7609 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -380,7 +380,7 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
}
void
-EditorRouteGroups::row_change (const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter)
+EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel::iterator& iter)
{
RouteGroup* group;
@@ -487,7 +487,7 @@ EditorRouteGroups::groups_changed ()
}
void
-EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange& change)
+EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
{
_in_row_change = true;
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 9fa9c8bf73..5dbeeffd09 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -180,7 +180,7 @@ GroupTabs::on_motion_notify_event (GdkEventMotion* ev)
bool
-GroupTabs::on_button_release_event (GdkEventButton* ev)
+GroupTabs::on_button_release_event (GdkEventButton*)
{
if (_dragging == 0) {
return false;
diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c
index 7332299bfb..1e5768040e 100644
--- a/gtk2_ardour/gtk_pianokeyboard.c
+++ b/gtk2_ardour/gtk_pianokeyboard.c
@@ -527,7 +527,7 @@ piano_keyboard_expose(GtkWidget *widget, GdkEventExpose *event)
}
static void
-piano_keyboard_size_request(GtkWidget* widget, GtkRequisition *requisition)
+piano_keyboard_size_request(GtkWidget* w, GtkRequisition *requisition)
{
requisition->width = PIANO_KEYBOARD_DEFAULT_WIDTH;
requisition->height = PIANO_KEYBOARD_DEFAULT_HEIGHT;
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 75040eca06..56527e1eb9 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -199,7 +199,7 @@ PluginSelector::~PluginSelector ()
}
void
-PluginSelector::row_activated(Gtk::TreeModel::Path path, Gtk::TreeViewColumn* col)
+PluginSelector::row_activated(Gtk::TreeModel::Path, Gtk::TreeViewColumn*)
{
btn_add_clicked();
}
diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc
index d942c99c89..a259f357ce 100644
--- a/gtk2_ardour/port_matrix.cc
+++ b/gtk2_ardour/port_matrix.cc
@@ -444,10 +444,8 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t)
if (bc[dim].channel != -1) {
add_remove_option (sub, w, bc[dim].channel);
} else {
-
- snprintf (buf, sizeof (buf), _("Remove all"));
sub.push_back (
- MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_all_channels), w))
+ MenuElem (_("Remove all"), sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_all_channels), w))
);
if (bc[dim].bundle->nchannels().n_total() > 1) {
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index e2d33b9891..1bba2c8af1 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -965,7 +965,7 @@ ProcessorBox::enter_notify (GdkEventCrossing*)
}
bool
-ProcessorBox::leave_notify (GdkEventCrossing* ev)
+ProcessorBox::leave_notify (GdkEventCrossing*)
{
return false;
}
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 8d8c4224b0..64ba5b067d 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -629,7 +629,7 @@ RouteUI::update_monitoring_display ()
}
bool
-RouteUI::monitor_input_press(GdkEventButton* ev)
+RouteUI::monitor_input_press(GdkEventButton*)
{
return true;
}
@@ -641,7 +641,7 @@ RouteUI::monitor_input_release(GdkEventButton* ev)
}
bool
-RouteUI::monitor_disk_press (GdkEventButton* ev)
+RouteUI::monitor_disk_press (GdkEventButton*)
{
return true;
}
diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index 7e13c4f68b..70d04abb66 100644
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -369,7 +369,7 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
}
//---------
-int Mootcher::progress_callback(void *caller, double dltotal, double dlnow, double ultotal, double ulnow)
+int Mootcher::progress_callback(void *caller, double dltotal, double dlnow, double /*ultotal*/, double /*ulnow*/)
{
SoundFileBrowser *sfb = (SoundFileBrowser *) caller;
diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 3b5f8dbb78..abbd39ac16 100644
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -522,7 +522,7 @@ ShuttleControl::on_expose_event (GdkEventExpose*)
if (Config->get_shuttle_units() == Percentage) {
if (speed == 1.0) {
- snprintf (buf, sizeof (buf), _("Playing"));
+ snprintf (buf, sizeof (buf), "%s", _("Playing"));
} else {
if (speed < 0.0) {
snprintf (buf, sizeof (buf), "<<< %d%%", (int) round (-speed * 100));
@@ -544,7 +544,7 @@ ShuttleControl::on_expose_event (GdkEventExpose*)
}
} else {
- snprintf (buf, sizeof (buf), _("Stopped"));
+ snprintf (buf, sizeof (buf), "%s", _("Stopped"));
}
last_speed_displayed = speed;
@@ -559,10 +559,10 @@ ShuttleControl::on_expose_event (GdkEventExpose*)
switch (Config->get_shuttle_behaviour()) {
case Sprung:
- snprintf (buf, sizeof (buf), _("Sprung"));
+ snprintf (buf, sizeof (buf), "%s", _("Sprung"));
break;
case Wheel:
- snprintf (buf, sizeof (buf), _("Wheel"));
+ snprintf (buf, sizeof (buf), "%s", _("Wheel"));
break;
}
diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index bceb009b75..730ef58910 100644
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -111,7 +111,7 @@ StereoPanner::set_drag_data ()
}
bool
-StereoPanner::on_expose_event (GdkEventExpose* ev)
+StereoPanner::on_expose_event (GdkEventExpose*)
{
Glib::RefPtr<Gdk::Window> win (get_window());
Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state()));
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index d3c4ef17b8..3557727394 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -36,7 +36,7 @@ using namespace Gtkmm2ext;
using namespace ARDOUR;
using namespace PBD;
-TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action)
+TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&)
: ArdourDialog (_("New Tempo"))
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
@@ -51,7 +51,7 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string & action
init (when, tempo.beats_per_minute(), tempo.note_type(), true);
}
-TempoDialog::TempoDialog (TempoSection& section, const string & action)
+TempoDialog::TempoDialog (TempoSection& section, const string&)
: ArdourDialog ("Edit Tempo")
, bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
, bpm_spinner (bpm_adjustment)
@@ -251,7 +251,7 @@ TempoDialog::pulse_change ()
}
-MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action)
+MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&)
: ArdourDialog ("New Meter")
{
Timecode::BBT_Time when;
@@ -262,7 +262,7 @@ MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string & action
init (when, meter.divisions_per_bar(), meter.note_divisor(), true);
}
-MeterDialog::MeterDialog (MeterSection& section, const string & action)
+MeterDialog::MeterDialog (MeterSection& section, const string&)
: ArdourDialog ("Edit Meter")
{
init (section.start(), section.divisions_per_bar(), section.note_divisor(), section.movable());