ardour/livetrax
13
0
Fork 0
Code

remove almost-unusued stop_signal.h and clean up the one (unused) place where it was present (VisualTimeAxis, not used in current ardour)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7196 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-05-31 14:21:43 +00:00
parent 9b5f357490
commit a01dc9b6f2
23 changed files with 20 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/ardour_ui.cc
View File

@ -49,7 +49,6 @@
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/click_box.h"
#include "gtkmm2ext/fastmeter.h"
#include "gtkmm2ext/stop_signal.h"
#include "gtkmm2ext/popup.h"
#include "gtkmm2ext/window_title.h"

1
gtk2_ardour/audio_region_editor.cc
View File

@ -26,7 +26,6 @@
#include "ardour/utils.h"
#include "ardour/dB.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <cmath>
#include "audio_region_editor.h"

1
gtk2_ardour/audio_time_axis.cc
View File

@ -33,7 +33,6 @@
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/bindable_button.h>
#include <gtkmm2ext/utils.h>

2
gtk2_ardour/editor_regions.cc
View File

@ -33,8 +33,6 @@
#include "ardour/silentfilesource.h"
#include "ardour/profile.h"
#include <gtkmm2ext/stop_signal.h>
#include "editor.h"
#include "editing.h"
#include "keyboard.h"

1
gtk2_ardour/editor_route_groups.cc
View File

@ -20,7 +20,6 @@
#include <cstdlib>
#include <cmath>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/gtk_ui.h>
#include "ardour/route_group.h"

2
gtk2_ardour/editor_selection_list.cc
View File

@ -27,8 +27,6 @@
#include "ardour/session_selection.h"
#include "ardour/playlist.h"
#include <gtkmm2ext/stop_signal.h>
#include "editor.h"
#include "keyboard.h"
#include "selection.h"

1
gtk2_ardour/gain_meter.cc
View File

@ -32,7 +32,6 @@
#include <gdkmm/color.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/fastmeter.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/barcontroller.h>
#include <gtkmm2ext/gtk_ui.h>
#include "midi++/manager.h"

6
gtk2_ardour/gtk-custom-hruler.c
View File

@ -251,9 +251,9 @@ gtk_custom_hruler_draw_pos (GtkCustomRuler * ruler)
if ((bs_width > 0) && (bs_height > 0)) {
/* If a backing store exists, restore the ruler */
if (ruler->backing_store && ruler->non_gr_exp_gc)
gdk_draw_pixmap (ruler->widget.window,
ruler->non_gr_exp_gc,
ruler->backing_store, ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height);
gdk_draw_drawable (ruler->widget.window,
ruler->non_gr_exp_gc,
GDK_DRAWABLE(ruler->backing_store), ruler->xsrc, ruler->ysrc, ruler->xsrc, ruler->ysrc, bs_width, bs_height);
increment = (gfloat) width / (ruler->upper - ruler->lower);
x = ROUND ((ruler->position - ruler->lower) * increment) + (xthickness - bs_width) / 2 - 1;

6
gtk2_ardour/gtk-custom-ruler.c
View File

@ -442,9 +442,9 @@ gtk_custom_ruler_expose (GtkWidget * widget, GdkEventExpose * event)
gtk_custom_ruler_draw_ticks (ruler);
gdk_draw_pixmap (widget->window,
ruler->non_gr_exp_gc,
ruler->backing_store, 0, 0, 0, 0, widget->allocation.width, widget->allocation.height);
gdk_draw_drawable (widget->window,
ruler->non_gr_exp_gc,
GDK_DRAWABLE(ruler->backing_store), 0, 0, 0, 0, widget->allocation.width, widget->allocation.height);
gtk_custom_ruler_draw_pos (ruler);
}

1
gtk2_ardour/level_meter.cc
View File

@ -26,7 +26,6 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/fastmeter.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/barcontroller.h>
#include "midi++/manager.h"
#include "pbd/fastlog.h"

1
gtk2_ardour/location_ui.cc
View File

@ -21,7 +21,6 @@
#include <cstdlib>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include "ardour/utils.h"
#include "ardour/configuration.h"

1
gtk2_ardour/midi_time_axis.cc
View File

@ -35,7 +35,6 @@
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/bindable_button.h>
#include <gtkmm2ext/utils.h>

1
gtk2_ardour/mixer_strip.cc
View File

@ -28,7 +28,6 @@
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/bindable_button.h>

1
gtk2_ardour/panner_ui.cc
View File

@ -21,7 +21,6 @@
#include "ardour/io.h"
#include "ardour/dB.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/barcontroller.h>
#include "midi++/manager.h"
#include "pbd/fastlog.h"

1
gtk2_ardour/processor_box.cc
View File

@ -37,7 +37,6 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/doi.h>
#include "ardour/amp.h"

1
gtk2_ardour/region_editor.cc
View File

@ -26,7 +26,6 @@
#include "ardour/utils.h"
#include "ardour/dB.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <cmath>
#include "region_editor.h"

1
gtk2_ardour/route_params_ui.cc
View File

@ -23,7 +23,6 @@
#include <glibmm/thread.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/ardour.h"

1
gtk2_ardour/route_time_axis.cc
View File

@ -39,7 +39,6 @@
#include <gtkmm/menuitem.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/bindable_button.h>
#include <gtkmm2ext/utils.h>

1
gtk2_ardour/route_ui.cc
View File

@ -18,7 +18,6 @@
*/
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/bindable_button.h>

1
gtk2_ardour/time_axis_view.cc
View File

@ -32,7 +32,6 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/stop_signal.h>
#include "ardour/session.h"
#include "ardour/utils.h"

19
gtk2_ardour/visual_time_axis.cc
View File

@ -30,7 +30,6 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/stop_signal.h>
#include <gtkmm2ext/choice.h>
#include "ardour/session.h"
@ -373,22 +372,22 @@ VisualTimeAxis::name_entry_changed()
}
}
gint
bool
VisualTimeAxis::name_entry_button_press_handler(GdkEventButton *ev)
{
if (ev->button == 3) {
return stop_signal (name_entry, "button_press_event");
return true;
}
return FALSE;
return false
}
gint
bool
VisualTimeAxis::name_entry_button_release_handler(GdkEventButton *ev)
{
return FALSE;
return false;
}
gint
bool
VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
{
switch (ev->keyval) {
@ -396,11 +395,13 @@ VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
case GDK_Up:
case GDK_Down:
name_entry_changed ();
return TRUE;
return true;
default:
return FALSE;
break;
}
return false;
}

8
gtk2_ardour/visual_time_axis.h
View File

@ -227,10 +227,10 @@ class VisualTimeAxis : public TimeAxisView
// Handle name entry signals
void name_entry_changed() ;
gint name_entry_focus_out_handler(GdkEventFocus*) ;
gint name_entry_key_release_handler(GdkEventKey*) ;
gint name_entry_button_release_handler(GdkEventButton*) ;
gint name_entry_button_press_handler(GdkEventButton*) ;
bool name_entry_focus_out_handler(GdkEventFocus*) ;
bool name_entry_key_release_handler(GdkEventKey*) ;
bool name_entry_button_release_handler(GdkEventButton*) ;
bool name_entry_button_press_handler(GdkEventButton*) ;
//---------------------------------------------------------------------------------------//
// VisualTimeAxis Widgets

33
libs/gtkmm2ext/gtkmm2ext/stop_signal.h
View File

@ -1,33 +0,0 @@
/*
Copyright (C) 2000-2007 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ardour_gtk_stop_signal_h__
#define __ardour_gtk_stop_signal_h__
#include <gtkmm.h>
#include <gtk/gtksignal.h>
static inline gint
stop_signal (Gtk::Widget& widget, const char *signal_name)
{
gtk_signal_emit_stop_by_name (GTK_OBJECT(widget.gobj()), signal_name);
return TRUE;
}
#endif /* __ardour_gtk_stop_signal_h__ */