First version of timecode widget adapted from Ardour.

src/gui/Makefile.am

@@ -95,6 +95,8 @@ gtk_gui_la_SOURCES =								\
 	$(lumigui_srcdir)/panels/timeline-panel.hpp				\
 	$(lumigui_srcdir)/panels/viewer-panel.cpp				\
 	$(lumigui_srcdir)/panels/viewer-panel.hpp				\
+	$(lumigui_srcdir)/util/convert.cpp					\
+	$(lumigui_srcdir)/util/convert.hpp					\
 	$(lumigui_srcdir)/util/rectangle.cpp					\
 	$(lumigui_srcdir)/util/rectangle.hpp					\
 	$(lumigui_srcdir)/widgets/button-bar.cpp				\
@@ -104,6 +106,8 @@ gtk_gui_la_SOURCES =								\
 	$(lumigui_srcdir)/widgets/mini-button.hpp				\
 	$(lumigui_srcdir)/widgets/panel-bar.cpp					\
 	$(lumigui_srcdir)/widgets/panel-bar.hpp					\
+	$(lumigui_srcdir)/widgets/timecode-widget.cpp				\
+	$(lumigui_srcdir)/widgets/timecode-widget.hpp				\
 	$(lumigui_srcdir)/widgets/timeline-widget.cpp				\
 	$(lumigui_srcdir)/widgets/timeline-widget.hpp				\
 	$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.cpp		\

src/gui/panels/timeline-panel.cpp

@@ -49,8 +49,7 @@ const int TimelinePanel::ZoomToolSteps = 2; // 2 seems comfortable
 TimelinePanel::TimelinePanel(workspace::PanelManager &panel_manager,
     GdlDockItem *dock_item) :
   Panel(panel_manager, dock_item, get_title(), get_stock_id()),
-  timeIndicator(),
+  timeCode("sequence_clock", "timecode_widget", true),
-  timeIndicatorButton(),
   previousButton(Stock::MEDIA_PREVIOUS),
   rewindButton(Stock::MEDIA_REWIND),
   playPauseButton(Stock::MEDIA_PLAY),
@@ -82,11 +81,7 @@ TimelinePanel::TimelinePanel(workspace::PanelManager &panel_manager,
   panelBar.pack_start(sequenceChooser, PACK_SHRINK);
 
   // Setup the toolbar
-  timeIndicatorButton.add(timeIndicator);
+  toolbar.append(timeCode);
-  timeIndicatorButton.set_relief(Gtk::RELIEF_NONE);
-  timeIndicatorButton.set_focus_on_click(false);
-  
-  toolbar.append(timeIndicatorButton);
   
   toolbar.append(previousButton);
   toolbar.append(rewindButton);
@@ -114,7 +109,6 @@ TimelinePanel::TimelinePanel(workspace::PanelManager &panel_manager,
 
   // Setup tooltips
   sequenceChooser     .set_tooltip_text(_("Change sequence"));
-  timeIndicatorButton .set_tooltip_text(_("Go to time code"));
 
   previousButton  .set_tooltip_text(_("To beginning"));
   rewindButton    .set_tooltip_text(_("Rewind"));
@@ -374,7 +368,7 @@ TimelinePanel::set_tool(timeline::ToolType tool)
 void
 TimelinePanel::show_time(gavl_time_t time)
 {
-  timeIndicator.set_text(lumiera_tmpbuf_print_time(time));
+  // timeIndicator.set_text(lumiera_tmpbuf_print_time(time));
 }
 
 bool

src/gui/panels/timeline-panel.hpp

@@ -27,6 +27,7 @@
 #define TIMELINE_PANEL_HPP
 
 #include "panel.hpp"
+#include "../widgets/timecode-widget.hpp"
 #include "../widgets/timeline-widget.hpp"
 
 using namespace gui::widgets;
@@ -168,8 +169,7 @@ private:
     timelineStates;
   
   // Toolbar Widgets
-  Gtk::Label timeIndicator;
+  TimeCode timeCode;
-  Gtk::Button timeIndicatorButton;
   
   MiniButton previousButton;
   MiniButton rewindButton;

src/gui/util/convert.cpp

@@ -0,0 +1,44 @@
+/*
+  convert.cpp - Defines utility functions for conversions
+ 
+  Copyright (C)         Lumiera.org
+    2006,               Paul Davis
+    2010,               Stefan Kangas <skangas@skangas.se>
+ 
+  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.
+ 
+*/
+
+#include <cstdlib>
+
+#include "convert.hpp"
+
+namespace gui {
+namespace util {
+
+double
+atof (const string& s)
+{
+	return std::atof (s.c_str());
+}
+
+int
+atoi (const string& s)
+{
+	return std::atoi (s.c_str());
+}
+
+}   // namespace util
+}   // namespace gui

src/gui/util/convert.hpp

@@ -0,0 +1,38 @@
+/*
+  convert.hpp  - Declares utility functions for conversions
+ 
+  Copyright (C)         Lumiera.org
+    2006,               Paul Davis
+    2010,               Stefan Kangas <skangas@skangas.se>
+ 
+  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.
+ 
+*/
+
+#include <string>
+
+using std::string;
+
+namespace gui {
+namespace util {
+
+double atof(const string& s);
+
+int atoi(const string& s);
+
+}   // namespace util
+}   // namespace gui
+
+

src/gui/widgets/timecode-widget.hpp

@@ -0,0 +1,192 @@
+/*
+  timecode-widget.hpp  -  Declaration of the timecode widget
+ 
+  Copyright (C) 1999 Paul Davis 
+
+  Copyright (C)         Lumiera.org
+    2010,               Stefan Kangas <skangas@skangas.se
+ 
+  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 TIMECODE_WIDGET_HPP
+#define TIMECODE_WIDGET_HPP
+
+#include <string>
+
+#include <gtkmm/box.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/eventbox.h>
+#include <gtkmm/label.h>
+#include <gtkmm/frame.h>
+
+namespace gui {
+namespace widgets {
+
+class TimeCode : public Gtk::HBox
+{
+public:
+  enum Mode {
+    SMPTE,
+    MinSec,
+    Frames,
+    Off
+  };
+  
+  TimeCode(std::string clock_name, std::string widget_name, bool editable /*, bool is_duration = false*/);
+
+  Mode mode() const { return _mode; }
+
+  void focus();
+
+  void set(gavl_time_t, bool force = false);
+  void set_mode(Mode);
+
+  void set_widget_name(std::string);
+
+  std::string name() const { return _name; }
+
+  gavl_time_t current_time(gavl_time_t position = 0) const;
+  gavl_time_t current_duration(gavl_time_t position = 0) const;
+
+  sigc::signal<void> ValueChanged;
+  sigc::signal<void> ChangeAborted;
+
+  static sigc::signal<void> ModeChanged;
+  // static std::vector<TimeCode*> clocks;
+
+  static bool has_focus() { return _has_focus; }
+
+private:
+  Mode             _mode;
+  unsigned int     key_entry_state;
+  std::string      _name;
+  // bool              is_duration;
+  bool              editable;
+
+  Gtk::Menu  *ops_menu;
+
+  Gtk::HBox   smpte_packer_hbox;
+  Gtk::HBox   smpte_packer;
+
+  Gtk::HBox   minsec_packer_hbox;
+  Gtk::HBox   minsec_packer;
+
+  Gtk::HBox   frames_packer_hbox;
+  Gtk::HBox   frames_packer;
+       
+  enum Field {
+    SMPTE_Hours,
+    SMPTE_Minutes,
+    SMPTE_Seconds,
+    SMPTE_Frames,
+    MS_Hours,
+    MS_Minutes,
+    MS_Seconds,
+    VFrames
+  };
+
+  Gtk::EventBox  audio_frames_ebox;
+  Gtk::Label     audio_frames_label;
+
+  Gtk::HBox      off_hbox;
+
+  Gtk::EventBox  hours_ebox;
+  Gtk::EventBox  minutes_ebox;
+  Gtk::EventBox  seconds_ebox;
+  Gtk::EventBox  frames_ebox;
+
+  Gtk::EventBox  ms_hours_ebox;
+  Gtk::EventBox  ms_minutes_ebox;
+  Gtk::EventBox  ms_seconds_ebox;
+
+  Gtk::Label  hours_label;
+  Gtk::Label  minutes_label;
+  Gtk::Label  seconds_label;
+  Gtk::Label  frames_label;
+  Gtk::Label  colon1, colon2, colon3;
+
+  Gtk::Label  ms_hours_label;
+  Gtk::Label  ms_minutes_label;
+  Gtk::Label  ms_seconds_label;
+  Gtk::Label  colon4, colon5;
+
+  Gtk::EventBox  clock_base;
+  Gtk::Frame     clock_frame;
+
+  gavl_time_t last_when;
+  bool last_pdelta;
+  bool last_sdelta;
+
+  int last_hrs;
+  int last_mins;
+  int last_secs;
+  int last_frames;
+  bool last_negative;
+
+  int  ms_last_hrs;
+  int  ms_last_mins;
+  float ms_last_secs;
+
+  bool dragging;
+  double drag_start_y;
+  double drag_y;
+  double drag_accum;
+
+  void on_realize();
+  
+  bool field_motion_notify_event(GdkEventMotion *ev, Field);
+  bool field_button_press_event(GdkEventButton *ev, Field);
+  bool field_button_release_event(GdkEventButton *ev, Field);
+  bool field_button_scroll_event(GdkEventScroll *ev, Field);
+  bool field_key_press_event(GdkEventKey *, Field);
+  bool field_key_release_event(GdkEventKey *, Field);
+  bool field_focus_in_event(GdkEventFocus *, Field);
+  bool field_focus_out_event(GdkEventFocus *, Field);
+  bool drop_focus_handler(GdkEventFocus*);
+
+  void set_smpte(gavl_time_t, bool);
+  void set_minsec(gavl_time_t, bool);
+  void set_frames(gavl_time_t, bool);
+
+  gavl_time_t get_frames(Field, gavl_time_t pos = 0, int dir=1);
+  
+  void smpte_sanitize_display();
+  gavl_time_t smpte_time_from_display() const;
+  gavl_time_t minsec_time_from_display() const;
+  gavl_time_t audio_time_from_display() const;
+
+  void build_ops_menu();
+  void setup_events();
+
+  void smpte_offset_changed();
+  void set_size_requests();
+
+  static const unsigned int field_length[(int)VFrames+1];
+  static bool _has_focus;
+  
+  void set_size_request_to_display_given_text(Gtk::Widget &w, const gchar *text,
+    gint hpadding, gint vpadding);
+
+  void get_ink_pixel_size(Glib::RefPtr<Pango::Layout> layout,
+    int& width, int& height);
+
+};
+
+}   // namespace widgets
+}   // namespace gui
+
+#endif // TIMECODE_WIDGET_HPP