projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Cruft -- AutomationStyle never did anything.
[ardour.git]
/
gtk2_ardour
/
panner_ui.h
diff --git
a/gtk2_ardour/panner_ui.h
b/gtk2_ardour/panner_ui.h
index dca24451d198aec34cd34668883eb5de3a652e2f..e6372f3486184625a4d0780082c335b91bf03175 100644
(file)
--- a/
gtk2_ardour/panner_ui.h
+++ b/
gtk2_ardour/panner_ui.h
@@
-73,7
+73,8
@@
class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void set_width (Width);
void setup_pan ();
void set_width (Width);
void setup_pan ();
- void set_available_panners(boost::shared_ptr<ARDOUR::Route>, std::map<std::string,std::string>);
+ void set_available_panners(std::map<std::string,std::string>);
+ void set_send_drawing_mode (bool);
void effective_pan_display ();
void effective_pan_display ();
@@
-85,6
+86,7
@@
class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
private:
friend class MixerStrip;
private:
friend class MixerStrip;
+ friend class SendUI;
boost::shared_ptr<ARDOUR::PannerShell> _panshell;
boost::shared_ptr<ARDOUR::Panner> _panner;
boost::shared_ptr<ARDOUR::PannerShell> _panshell;
boost::shared_ptr<ARDOUR::Panner> _panner;
@@
-95,8
+97,8
@@
class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
bool in_pan_update;
int _current_nouts;
int _current_nins;
bool in_pan_update;
int _current_nouts;
int _current_nins;
-
-
static const int pan_bar_height
;
+ std::string _current_uri;
+
bool _send_mode
;
Panner2d* twod_panner; ///< 2D panner, or 0
Panner2dWindow* big_window;
Panner2d* twod_panner; ///< 2D panner, or 0
Panner2dWindow* big_window;
@@
-119,7
+121,6
@@
class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
Gtk::Menu* pan_astate_menu;
Gtk::Menu* pan_astyle_menu;
Gtk::Menu* pan_astate_menu;
Gtk::Menu* pan_astyle_menu;
- Gtk::Button pan_automation_style_button;
Gtk::ToggleButton pan_automation_state_button;
void pan_value_changed (uint32_t which);
Gtk::ToggleButton pan_automation_state_button;
void pan_value_changed (uint32_t which);
@@
-145,8
+146,6
@@
class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
void pan_set_custom_type (std::string type);
void pan_automation_state_changed();
void pan_set_custom_type (std::string type);
void pan_automation_state_changed();
- void pan_automation_style_changed();
- gint pan_automation_style_button_event (GdkEventButton *);
gint pan_automation_state_button_event (GdkEventButton *);
sigc::connection pan_watching;
gint pan_automation_state_button_event (GdkEventButton *);
sigc::connection pan_watching;
@@
-154,14
+153,9
@@
class PannerUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
std::string short_astate_string (ARDOUR::AutoState);
std::string _astate_string (ARDOUR::AutoState, bool);
std::string short_astate_string (ARDOUR::AutoState);
std::string _astate_string (ARDOUR::AutoState, bool);
- std::string astyle_string (ARDOUR::AutoStyle);
- std::string short_astyle_string (ARDOUR::AutoStyle);
- std::string _astyle_string (ARDOUR::AutoStyle, bool);
-
void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
void start_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
void stop_touch (boost::weak_ptr<ARDOUR::AutomationControl>);
- boost::shared_ptr<ARDOUR::Route> _route;
std::map<std::string,std::string> _panner_list;
bool _suspend_menu_callbacks;
};
std::map<std::string,std::string> _panner_list;
bool _suspend_menu_callbacks;
};