From 88d4145b02aafe023ba9a48bacaf01fa592a0b7a Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Fri, 18 Nov 2022 15:11:32 +0100 Subject: [PATCH] AudioClock: drop other unused stuff --- gtk2_ardour/audio_clock.cc | 3 --- gtk2_ardour/audio_clock.h | 17 +++-------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index b24b8502bb..ac8a2df960 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -97,8 +97,6 @@ AudioClock::AudioClock (const string& clock_name, bool transient, const string& , corner_radius (4) , font_size (10240) , editing (false) - , last_pdelta (0) - , last_sdelta (0) , dragging (false) , drag_field (Field (0)) , xscale (1.0) @@ -1474,7 +1472,6 @@ AudioClock::on_key_press_event (GdkEventKey* ev) case GDK_Escape: end_edit (false); - ChangeAborted(); /* EMIT SIGNAL */ return true; case GDK_Delete: diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index 5c61b3ae05..afea1f9d4a 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -48,7 +48,7 @@ namespace ARDOUR { class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr { - public: +public: enum Mode { Timecode, BBT, @@ -80,7 +80,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr void set_from_playhead (); void locate (); void set_mode (Mode); - void set_bbt_reference (Temporal::timepos_t const &); void copy_text_to_clipboard () const; @@ -106,11 +105,10 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr sigc::signal ValueChanged; sigc::signal mode_changed; - sigc::signal ChangeAborted; static std::vector clocks; - protected: +protected: void render (Cairo::RefPtr const&, cairo_rectangle_t*); bool get_is_duration () const { return is_duration; } @@ -123,7 +121,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr ArdourWidgets::ArdourButton _left_btn; ArdourWidgets::ArdourButton _right_btn; - private: +private: Mode _mode; std::string _name; bool is_duration; @@ -136,7 +134,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr bool edit_is_negative; Temporal::timepos_t _limit_pos; - Temporal::timepos_t duration_position; Glib::RefPtr _layout; @@ -156,10 +153,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr double corner_radius; uint32_t font_size; - static const double info_font_scale_factor; - static const double separator_height; - static const double x_leading_padding; - enum Field { Timecode_Hours = 1, Timecode_Minutes, @@ -194,9 +187,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr Temporal::timecnt_t last_time; - bool last_pdelta; - bool last_sdelta; - bool dragging; double drag_start_y; double drag_y; @@ -244,7 +234,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr void start_edit (Field f = Field (0)); void end_edit (bool); void end_edit_relative (bool); - void edit_next_field (); Temporal::timecnt_t parse_as_distance (const std::string&); Temporal::timecnt_t parse_as_timecode_distance (const std::string&);