projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix double quote in fr.po
[ardour.git]
/
gtk2_ardour
/
location_ui.h
diff --git
a/gtk2_ardour/location_ui.h
b/gtk2_ardour/location_ui.h
index a17724f5ba5ff1e0fe45922a1e54b8456aba3048..cdbc952e6c11821cbf6bacb727d0a112b3367363 100644
(file)
--- a/
gtk2_ardour/location_ui.h
+++ b/
gtk2_ardour/location_ui.h
@@
-26,21
+26,26
@@
#include <gtkmm/table.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include <gtkmm/table.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
-#include <gtkmm/paned.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/scrolledwindow.h>
+#include "pbd/signals.h"
+
#include "ardour/location.h"
#include "ardour/location.h"
+#include "ardour/session_handle.h"
+
+#include <gtkmm2ext/pane.h>
-#include "ardour_dialog.h"
+#include "ardour_button.h"
+#include "ardour_window.h"
#include "audio_clock.h"
namespace ARDOUR {
#include "audio_clock.h"
namespace ARDOUR {
- class LocationStack;
- class Session;
class Location;
}
class Location;
}
-class LocationEditRow : public Gtk::HBox
+class ClockGroup;
+
+class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
{
public:
LocationEditRow (ARDOUR::Session *sess=0, ARDOUR::Location *loc=0, int32_t num=-1);
{
public:
LocationEditRow (ARDOUR::Session *sess=0, ARDOUR::Location *loc=0, int32_t num=-1);
@@
-53,6
+58,8
@@
class LocationEditRow : public Gtk::HBox
void set_number (int);
void focus_name();
void set_number (int);
void focus_name();
+ void set_clock_group (ClockGroup&);
+ void unset_clock_group () { _clock_group = 0; }
sigc::signal<void,ARDOUR::Location*> remove_requested;
sigc::signal<void> redraw_ranges;
sigc::signal<void,ARDOUR::Location*> remove_requested;
sigc::signal<void> redraw_ranges;
@@
-66,9
+73,6
@@
class LocationEditRow : public Gtk::HBox
};
ARDOUR::Location *location;
};
ARDOUR::Location *location;
- ARDOUR::Session *session;
-
-
Gtk::Table item_table;
Gtk::Table item_table;
@@
-77,18
+81,22
@@
class LocationEditRow : public Gtk::HBox
Gtk::Label number_label;
Gtk::HBox start_hbox;
Gtk::Label number_label;
Gtk::HBox start_hbox;
- Gtk::Button start_go_button;
AudioClock start_clock;
AudioClock start_clock;
+ ArdourButton start_to_playhead_button;
+ ArdourButton locate_to_start_button;
Gtk::HBox end_hbox;
Gtk::HBox end_hbox;
- Gtk::Button end_go_button;
AudioClock end_clock;
AudioClock end_clock;
+ ArdourButton end_to_playhead_button;
+ ArdourButton locate_to_end_button;
AudioClock length_clock;
Gtk::CheckButton cd_check_button;
Gtk::CheckButton hide_check_button;
AudioClock length_clock;
Gtk::CheckButton cd_check_button;
Gtk::CheckButton hide_check_button;
+ Gtk::CheckButton lock_check_button;
+ Gtk::CheckButton glue_check_button;
-
Gtk::
Button remove_button;
+
Ardour
Button remove_button;
Gtk::HBox cd_track_details_hbox;
Gtk::Entry isrc_entry;
Gtk::HBox cd_track_details_hbox;
Gtk::Entry isrc_entry;
@@
-96,12
+104,14
@@
class LocationEditRow : public Gtk::HBox
Gtk::Label performer_label;
Gtk::Label performer_label;
- Gtk::Entry performer_entry;
+ Gtk::Entry
performer_entry;
Gtk::Label composer_label;
Gtk::Label composer_label;
- Gtk::Entry composer_entry;
+ Gtk::Entry
composer_entry;
Gtk::CheckButton scms_check_button;
Gtk::CheckButton scms_check_button;
+ Gtk::Label scms_label;
Gtk::CheckButton preemph_check_button;
Gtk::CheckButton preemph_check_button;
-
+ Gtk::Label preemph_label;
+ ClockGroup* _clock_group;
guint32 i_am_the_modifier;
int number;
guint32 i_am_the_modifier;
int number;
@@
-111,68
+121,71
@@
class LocationEditRow : public Gtk::HBox
void performer_entry_changed ();
void composer_entry_changed ();
void performer_entry_changed ();
void composer_entry_changed ();
- void
set
_button_pressed (LocationPart part);
- void
go
_button_pressed (LocationPart part);
+ void
to_playhead
_button_pressed (LocationPart part);
+ void
locate
_button_pressed (LocationPart part);
void clock_changed (LocationPart part);
void clock_changed (LocationPart part);
-
void change_aborted (LocationPart part
);
+
bool locate_to_clock (GdkEventButton*, AudioClock*
);
void cd_toggled ();
void hide_toggled ();
void cd_toggled ();
void hide_toggled ();
+ void lock_toggled ();
+ void glue_toggled ();
void remove_button_pressed ();
void scms_toggled ();
void preemph_toggled ();
void remove_button_pressed ();
void scms_toggled ();
void preemph_toggled ();
- void end_changed (ARDOUR::Location *);
- void start_changed (ARDOUR::Location *);
- void name_changed (ARDOUR::Location *);
- void location_changed (ARDOUR::Location *);
- void flags_changed (ARDOUR::Location *, void *src);
+ void end_changed ();
+ void start_changed ();
+ void name_changed ();
+ void location_changed ();
+ void flags_changed ();
+ void lock_changed ();
+ void position_lock_style_changed ();
- sigc::connection start_changed_connection;
- sigc::connection end_changed_connection;
- sigc::connection name_changed_connection;
- sigc::connection changed_connection;
- sigc::connection flags_changed_connection;
+ void set_clock_editable_status ();
+ void show_cd_track_details ();
+ PBD::ScopedConnectionList connections;
};
};
-class LocationUI : public Gtk::HBox
+class LocationUI : public Gtk::HBox
, public ARDOUR::SessionHandlePtr
{
public:
LocationUI ();
~LocationUI ();
{
public:
LocationUI ();
~LocationUI ();
-
- virtual void set_session (ARDOUR::Session *);
+
+ void set_session (ARDOUR::Session *);
+ void set_clock_mode (AudioClock::Mode);
void add_new_location();
void add_new_range();
void refresh_location_list ();
void add_new_location();
void add_new_range();
void refresh_location_list ();
- void refresh_location_list_s (ARDOUR::Change);
+
+ XMLNode & get_state () const;
private:
private:
- ARDOUR::Session* session;
- ARDOUR::LocationStack* locations;
+ /** set to the location that has just been created with the LocationUI `add' button
+ (if Config->get_name_new_markers() is true); if it is non-0, the name entry of
+ the location is given the focus by location_added().
+ */
ARDOUR::Location *newest_location;
ARDOUR::Location *newest_location;
- void session_gone();
-
- Gtk::VBox location_vpacker;
+ void session_going_away ();
LocationEditRow loop_edit_row;
LocationEditRow punch_edit_row;
LocationEditRow loop_edit_row;
LocationEditRow punch_edit_row;
+ Gtk::VBox loop_punch_box;
- Gtk
::VPaned
loc_range_panes;
+ Gtk
mm2ext::VPane
loc_range_panes;
- Gtk::Frame loc_frame;
Gtk::VBox loc_frame_box;
Gtk::Button add_location_button;
Gtk::ScrolledWindow location_rows_scroller;
Gtk::VBox location_rows;
Gtk::VBox loc_frame_box;
Gtk::Button add_location_button;
Gtk::ScrolledWindow location_rows_scroller;
Gtk::VBox location_rows;
- Gtk::Frame range_frame;
Gtk::VBox range_frame_box;
Gtk::Button add_range_button;
Gtk::ScrolledWindow range_rows_scroller;
Gtk::VBox range_frame_box;
Gtk::Button add_range_button;
Gtk::ScrolledWindow range_rows_scroller;
@@
-193,16
+206,19
@@
class LocationUI : public Gtk::HBox
void location_removed (ARDOUR::Location *);
void location_added (ARDOUR::Location *);
void location_removed (ARDOUR::Location *);
void location_added (ARDOUR::Location *);
- void map_locations (ARDOUR::Locations::LocationList&);
+ void map_locations (const ARDOUR::Locations::LocationList&);
+
+ ClockGroup* _clock_group;
+ AudioClock::Mode clock_mode_from_session_instant_xml () const;
};
};
-class LocationUIWindow : public Ardour
Dialog
+class LocationUIWindow : public Ardour
Window
{
public:
LocationUIWindow ();
~LocationUIWindow ();
{
public:
LocationUIWindow ();
~LocationUIWindow ();
- void on_
show
();
+ void on_
map
();
void set_session (ARDOUR::Session *);
LocationUI& ui() { return _ui; }
void set_session (ARDOUR::Session *);
LocationUI& ui() { return _ui; }
@@
-210,7
+226,7
@@
class LocationUIWindow : public ArdourDialog
protected:
LocationUI _ui;
bool on_delete_event (GdkEventAny*);
protected:
LocationUI _ui;
bool on_delete_event (GdkEventAny*);
- void session_go
ne
();
+ void session_go
ing_away
();
};
#endif // __ardour_location_ui_h__
};
#endif // __ardour_location_ui_h__