summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/about.cc2
-rwxr-xr-xgtk2_ardour/ardev2
-rw-r--r--gtk2_ardour/ardour-menus.xml4
-rw-r--r--gtk2_ardour/ardour_dialog.cc2
-rw-r--r--gtk2_ardour/ardour_ui2.cc2
-rw-r--r--gtk2_ardour/ardour_ui_dialogs.cc5
-rw-r--r--gtk2_ardour/ardour_ui_ed.cc1
-rw-r--r--gtk2_ardour/editor.cc2
-rw-r--r--gtk2_ardour/option_editor.cc3
-rw-r--r--gtk2_ardour/opts.cc2
-rw-r--r--gtk2_ardour/sfdb_ui.cc34
-rw-r--r--gtk2_ardour/sfdb_ui.h6
12 files changed, 42 insertions, 23 deletions
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 500242ae59..9c13f49dc7 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -159,6 +159,8 @@ About::About ()
: paypal_pixmap (paypal_xpm)
#endif
{
+ set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
+
string path;
string t;
diff --git a/gtk2_ardour/ardev b/gtk2_ardour/ardev
index 961c7534fb..f1b409182a 100755
--- a/gtk2_ardour/ardev
+++ b/gtk2_ardour/ardev
@@ -5,7 +5,7 @@ export ARDOUR_GLADE_PATH=./glade
if [ -x ./ardour.bin ] ; then
# scons executable
export LD_LIBRARY_PATH=../libs/ardour
- exec ./ardour.bin --novst $*
+ exec ./ardour.bin --novst --display=localhost:0.0 $*
else
# autofoo/make executable
export LD_LIBRARY_PATH=../libs/ardour
diff --git a/gtk2_ardour/ardour-menus.xml b/gtk2_ardour/ardour-menus.xml
index 420fedddd5..efceee22b2 100644
--- a/gtk2_ardour/ardour-menus.xml
+++ b/gtk2_ardour/ardour-menus.xml
@@ -122,10 +122,12 @@
<menuitem action='GotoEditor'/>
<menuitem action='GotoMixer'/>
<menuitem action='ToggleOptionsEditor'/>
- <menuitem action='ToggleAudioLibrary'/>
+ <menuitem action='ToggleSoundFileBrowser'/>
<menuitem action='ToggleConnections'/>
<menuitem action='ToggleLocations'/>
<menuitem action='ToggleBigClock'/>
+ <separator/>
+ <menuitem action='About'/>
</menu>
<menu name='Options' action='Options'>
<menuitem action='SendMTC'/>
diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 41d9c60444..c5162919d4 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -30,6 +30,8 @@ ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
: Dialog (title, modal, use_seperator)
{
session = 0;
+
+ set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
}
ArdourDialog::~ArdourDialog ()
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 687508654b..804027092f 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -533,7 +533,7 @@ ARDOUR_UI::manage_window (Window& win)
void
ARDOUR_UI::detach_tearoff (Box* b, Widget* w)
{
- editor->ensure_float (transport_tearoff->tearoff_window());
+// editor->ensure_float (transport_tearoff->tearoff_window());
b->remove (*w);
}
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index fe34ac523e..22fa1d384f 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -76,6 +76,9 @@ ARDOUR_UI::connect_to_session (Session *s)
option_editor->set_session (s);
}
+ if (sfdb) {
+ sfdb->set_session (s);
+ }
Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
Blink.connect (mem_fun(*this, &ARDOUR_UI::solo_blink));
@@ -348,9 +351,11 @@ ARDOUR_UI::toggle_sound_file_browser ()
RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
if (tact->get_active()) {
+ sfdb->show_all();
sfdb->present();
} else {
sfdb->hide ();
}
}
}
+
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index fd9f49a251..669eb3a65d 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -165,7 +165,6 @@ ARDOUR_UI::install_actions ()
ActionManager::register_action (common_actions, X_("GotoMixer"), _("Mixer"), mem_fun(*this, &ARDOUR_UI::goto_mixer_window));
ActionManager::register_toggle_action (common_actions, X_("ToggleSoundFileBrowser"), _("Sound File Browser"), mem_fun(*this, &ARDOUR_UI::toggle_sound_file_browser));
ActionManager::register_toggle_action (common_actions, X_("ToggleOptionsEditor"), _("Options Editor"), mem_fun(*this, &ARDOUR_UI::toggle_options_window));
- ActionManager::register_toggle_action (common_actions, X_("ToggleAudioLibrary"), _("Audio Library"), mem_fun(*this, &ARDOUR_UI::toggle_sound_file_browser));
act = ActionManager::register_toggle_action (common_actions, X_("ToggleInspector"), _("Track/Bus Inspector"), mem_fun(*this, &ARDOUR_UI::toggle_route_params_window));
ActionManager::session_sensitive_actions.push_back (act);
act = ActionManager::register_toggle_action (common_actions, X_("ToggleConnections"), _("Connections"), mem_fun(*this, &ARDOUR_UI::toggle_connection_editor));
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3149e6081e..bca1643b40 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3677,8 +3677,6 @@ Editor::detach_tearoff (Gtk::Box* b, Gtk::Window* w)
mouse_mode_tearoff->torn_off()) {
top_hbox.remove (toolbar_frame);
}
-
- ensure_float (*w);
}
void
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 58bf35ee59..9126303c52 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -408,7 +408,7 @@ OptionEditor::setup_path_options()
{
Gtk::Label* label;
- path_table.set_homogeneous (true);
+ path_table.set_homogeneous (false);
path_table.set_border_width (12);
path_table.set_row_spacings (5);
@@ -432,6 +432,7 @@ OptionEditor::setup_path_options()
path_table.attach(sfdb_path_view, 1, 3, 2, 3, Gtk::FILL|Gtk::EXPAND, FILL);
sfdb_path_view.append_column(_("Paths"), sfdb_path_columns.paths);
+ sfdb_path_view.set_size_request(-1, 100);
vector<string> nfstrings = internationalize (native_format_strings);
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 48245651e8..481fb0ddbe 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -100,7 +100,7 @@ GTK_ARDOUR::parse_opts (int argc, char *argv[])
switch (c) {
case 0:
break;
-
+
case 'v':
just_version = true;
break;
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 25481711d3..2c7003c6f1 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -31,8 +31,9 @@
std::string length2string (const int32_t frames, const int32_t sample_rate);
-SoundFileBox::SoundFileBox (ARDOUR::Session* session)
+SoundFileBox::SoundFileBox ()
:
+ _session(0),
current_pid(0),
fields(Gtk::ListStore::create(label_columns)),
main_box (false, 3),
@@ -80,12 +81,6 @@ SoundFileBox::SoundFileBox (ARDOUR::Session* session)
play_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::play_btn_clicked));
stop_btn.signal_clicked().connect (mem_fun (*this, &SoundFileBox::stop_btn_clicked));
- if (!session) {
- play_btn.set_sensitive(false);
- } else {
- session->AuditionActive.connect(mem_fun (*this, &SoundFileBox::audition_status_changed));
- }
-
add_field_btn.signal_clicked().connect
(mem_fun (*this, &SoundFileBox::add_field_clicked));
remove_field_btn.signal_clicked().connect
@@ -98,6 +93,18 @@ SoundFileBox::SoundFileBox (ARDOUR::Session* session)
stop_btn.hide();
}
+void
+SoundFileBox::set_session(ARDOUR::Session* s)
+{
+ _session = s;
+
+ if (!_session) {
+ play_btn.set_sensitive(false);
+ } else {
+ _session->AuditionActive.connect(mem_fun (*this, &SoundFileBox::audition_status_changed));
+ }
+}
+
int
SoundFileBox::setup_labels (string filename)
{
@@ -177,15 +184,18 @@ SoundFileBox::update (std::string filename)
SoundFileBrowser::SoundFileBrowser (std::string title)
:
ArdourDialog(title),
- chooser(Gtk::FILE_CHOOSER_ACTION_OPEN),
- preview(session)
+ chooser(Gtk::FILE_CHOOSER_ACTION_OPEN)
{
get_vbox()->pack_start(chooser);
chooser.set_preview_widget(preview);
chooser.signal_update_preview().connect(mem_fun(*this, &SoundFileBrowser::update_preview));
+}
- show_all();
+void
+SoundFileBrowser::set_session (ARDOUR::Session* s)
+{
+ preview.set_session(s);
}
void
@@ -200,8 +210,6 @@ SoundFileChooser::SoundFileChooser (std::string title)
{
add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_OK);
add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
-
- show_all();
}
SoundFileOmega::SoundFileOmega (std::string title)
@@ -219,8 +227,6 @@ SoundFileOmega::SoundFileOmega (std::string title)
embed_btn.signal_clicked().connect (mem_fun (*this, &SoundFileOmega::embed_clicked));
import_btn.signal_clicked().connect (mem_fun (*this, &SoundFileOmega::import_clicked));
-
- show_all();
}
void
diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 6be971ca73..2c43fb1aa7 100644
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -47,12 +47,15 @@
class SoundFileBox : public Gtk::VBox
{
public:
- SoundFileBox (ARDOUR::Session* session);
+ SoundFileBox ();
virtual ~SoundFileBox () {};
bool update (std::string filename);
+ void set_session (ARDOUR::Session* s);
protected:
+ ARDOUR::Session* _session;
+
struct LabelModelColumns : public Gtk::TreeModel::ColumnRecord
{
public:
@@ -111,6 +114,7 @@ class SoundFileBrowser : public ArdourDialog
SoundFileBrowser (std::string title);
virtual ~SoundFileBrowser () {};
+ virtual void set_session (ARDOUR::Session*);
protected:
Gtk::FileChooserWidget chooser;
SoundFileBox preview;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-11 06:25:14 +0000