smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

commits 6001-6525 inclusive from 2.X applied to 3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6942 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-04-21 02:24:38 +00:00
parent cf77196698
commit d9cebc2edf
26 changed files with 361 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/ardour_ui.h
View file

@ -147,8 +147,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
int unload_session (bool hide_stuff = false);
void close_session();
int save_state_canfail (std::string state_name = "");
void save_state (const std::string & state_name = "");
int save_state_canfail (std::string state_name = "", bool switch_to_it = false);
void save_state (const std::string & state_name = "", bool switch_to_it = false);
static double gain_to_slider_position (ARDOUR::gain_t g);
static ARDOUR::gain_t slider_position_to_gain (double pos);
@ -282,7 +282,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void map_transport_state ();
int32_t do_engine_start ();
void engine_halted ();
void engine_halted (const char* reason, bool free_reason);
void engine_stopped ();
void engine_running ();
@ -567,7 +567,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
guint32 last_key_press_time;
void snapshot_session ();
void snapshot_session (bool switch_to_it);
Mixer_UI *mixer;
int create_mixer ();
@ -694,6 +694,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
Glib::RefPtr<Gtk::TextBuffer::Tag> ptag, Glib::RefPtr<Gtk::TextBuffer::Tag> mtag,
const char *msg);
Gtk::Label status_bar_label;
bool status_bar_button_press (GdkEventButton*);
Gtk::ToggleButton error_log_button;
void loading_message (const std::string& msg);