Compare commits

...

4 Commits

23 changed files with 5316 additions and 3 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,83 @@
/*
* Copyright (C) 2009-2011 Carl Hetherington <carl@carlh.net>
* Copyright (C) 2012-2017 Robin Gareus <robin@gareus.org>
* Copyright (C) 2012-2018 Paul Davis <paul@linuxaudiosystems.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef __gtk_ardour_rc_option_editor_h__
#define __gtk_ardour_rc_option_editor_h__
#include "widgets/tabbable.h"
#include "option_editor.h"
#include "visibility_group.h"
#include "transport_masters_dialog.h"
/** @file rc_option_editor.h
* @brief Editing of options which are obtained from and written back to one of the .rc files.
*
* This is subclassed from OptionEditor. Simple options (e.g. boolean and simple choices)
* are expressed using subclasses of Option. More complex UI elements are represented
* using individual classes subclassed from OptionEditorBox.
*/
/** Editor for options which are obtained from and written back to one of the .rc files. */
class RCOptionEditor : public OptionEditorContainer, public ARDOUR::SessionHandlePtr, public ArdourWidgets::Tabbable
{
public:
RCOptionEditor ();
void set_session (ARDOUR::Session*);
Gtk::Window* use_own_window (bool and_fill_it);
XMLNode& get_state () const;
bool on_key_release_event (GdkEventKey*);
private:
void parameter_changed (std::string const &);
void ltc_generator_volume_changed ();
ARDOUR::RCConfiguration* _rc_config;
BoolOption* _solo_control_is_listen_control;
ComboOption<ARDOUR::ListenPosition>* _listen_position;
VisibilityGroup _mixer_strip_visibility;
BoolOption* _sync_framerate;
HSliderOption* _ltc_volume_slider;
Gtk::Adjustment* _ltc_volume_adjustment;
BoolOption* _ltc_send_continuously;
BoolOption* _plugin_prefer_inline;
BoolOption* _cairo_image_surface;
TransportMastersWidget _transport_masters_widget;
PBD::ScopedConnection parameter_change_connection;
PBD::ScopedConnection engine_started_connection;
void show_audio_setup ();
void show_transport_masters ();
void reset_clip_library_dir ();
EntryOption* mrl_option;
EntryOption* mru_option;
std::string get_default_lower_midi_note ();
bool set_default_lower_midi_note (std::string);
std::string get_default_upper_midi_note ();
bool set_default_upper_midi_note (std::string);
};
#endif /* __gtk_ardour_rc_option_editor_h__ */

View File

@ -463,7 +463,7 @@ int main (int argc, char *argv[])
ARDOUR::Profile->set_mixbus ();
}
if (g_getenv ("LIVETRAX")) {
if (!strcmp (PROGRAM_NAME, X_("Livetrax"))) {
ARDOUR::Profile->set_livetrax ();
}

View File

@ -35,6 +35,7 @@
#include "gtkmm2ext/colors.h"
#include "ardour/dB.h"
#include "ardour/profile.h"
#include "ardour/rc_configuration.h"
#include "ardour/session.h"
#include "ardour/types.h"
@ -1216,7 +1217,12 @@ OptionEditorWindow::OptionEditorWindow (PBD::Configuration* c, string const& str
hpacker.set_border_width (4);
Frame* f = manage (new Frame ());
f->add (treeview());
if (Profile->get_livetrax()) {
f->add (button_box());
} else {
f->add (treeview());
}
f->set_shadow_type (Gtk::SHADOW_OUT);
f->set_border_width (0);
vpacker.pack_start (*f, true, true);

View File

@ -726,6 +726,7 @@ protected:
PBD::Configuration* _config;
Gtk::Notebook& notebook() { return _notebook; }
Gtk::TreeView& treeview() { return option_treeview; }
Gtk::VBox& button_box() { return _button_box; }
class OptionColumns : public Gtk::TreeModel::ColumnRecord
{
@ -775,6 +776,7 @@ private:
PBD::ScopedConnection config_connection;
Gtk::Notebook _notebook;
Gtk::TreeView option_treeview;
Gtk::VBox _button_box;
std::map<std::string, OptionEditorPage*> _pages;
void add_path_to_treeview (std::string const &, Gtk::Widget&);

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -238,7 +238,6 @@ gtk2_ardour_sources = [
'pt_import_selector.cc',
'public_editor.cc',
'quantize_dialog.cc',
'rc_option_editor.cc',
'rec_info_box.cc',
'recorder_group_tabs.cc',
'recorder_ui.cc',
@ -613,6 +612,11 @@ def build(bld):
obj.target = 'ardour-' + bld.env['VERSION']
obj.includes = ['.']
if Options.options.program_name == "Livetrax":
obj.source += [ 'livetrax_rc_option_editor.cc' ]
else:
obj.source += [ 'rc_option_editor.cc' ]
if bld.is_defined('WINDOWS_VST_SUPPORT'):
obj.includes += [ '../libs/fst' ]