projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set the CairoWidget focus handler; reset focus when the mouse pointer leaves the...
[ardour.git]
/
gtk2_ardour
/
location_ui.h
diff --git
a/gtk2_ardour/location_ui.h
b/gtk2_ardour/location_ui.h
index 9637257f4991159fb41474325546f4d8b854511f..395464e0492f11cdc275c7f89d2187fed545c469 100644
(file)
--- a/
gtk2_ardour/location_ui.h
+++ b/
gtk2_ardour/location_ui.h
@@
-34,7
+34,7
@@
#include "ardour/location.h"
#include "ardour/session_handle.h"
#include "ardour/location.h"
#include "ardour/session_handle.h"
-#include "ardour_
dialog
.h"
+#include "ardour_
window
.h"
#include "audio_clock.h"
namespace ARDOUR {
#include "audio_clock.h"
namespace ARDOUR {
@@
-79,12
+79,12
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
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;
+ Gtk::Button start_to_playhead_button;
Gtk::HBox end_hbox;
Gtk::HBox end_hbox;
- Gtk::Button end_go_button;
AudioClock end_clock;
AudioClock end_clock;
+ Gtk::Button end_to_playhead_button;
AudioClock length_clock;
Gtk::CheckButton cd_check_button;
AudioClock length_clock;
Gtk::CheckButton cd_check_button;
@@
-104,7
+104,9
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
Gtk::Label composer_label;
Gtk::Entry composer_entry;
Gtk::CheckButton scms_check_button;
Gtk::Label composer_label;
Gtk::Entry composer_entry;
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;
ClockGroup* _clock_group;
guint32 i_am_the_modifier;
@@
-116,10
+118,9
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void composer_entry_changed ();
void to_playhead_button_pressed (LocationPart part);
void composer_entry_changed ();
void to_playhead_button_pressed (LocationPart part);
- void go_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 ();
@@
-138,7
+139,8
@@
class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void lock_changed (ARDOUR::Location *);
void position_lock_style_changed (ARDOUR::Location *);
void lock_changed (ARDOUR::Location *);
void position_lock_style_changed (ARDOUR::Location *);
- void set_clock_sensitivity ();
+ void set_clock_editable_status ();
+ void show_cd_track_details ();
PBD::ScopedConnectionList connections;
};
PBD::ScopedConnectionList connections;
};
@@
-157,8
+159,14
@@
class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void refresh_location_list ();
void refresh_location_list ();
+ XMLNode & get_state () const;
+
private:
ARDOUR::LocationStack* locations;
private:
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;
void session_going_away ();
ARDOUR::Location *newest_location;
void session_going_away ();
@@
-198,9
+206,10
@@
class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void map_locations (ARDOUR::Locations::LocationList&);
ClockGroup* _clock_group;
void map_locations (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 ();
{
public:
LocationUIWindow ();