smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

change GTKOSX macro constant to use __APPLE__ instead

Browse source
This commit is contained in:
Paul Davis 2015-10-27 13:43:31 -04:00
parent 329c096066
commit 56770ff0af
15 changed files with 43 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/add_video_dialog.cc
View file

@ -108,7 +108,7 @@ AddVideoDialog::AddVideoDialog (Session* s)
/* file chooser */ /* file chooser */
chooser.set_border_width (4); chooser.set_border_width (4);
#ifdef GTKOSX #ifdef __APPLE__
/* some broken redraw behaviour - this is a bandaid */ /* some broken redraw behaviour - this is a bandaid */
chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw)); chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
#endif #endif

2
gtk2_ardour/ardour_ui.cc
View file

@ -627,7 +627,7 @@ ARDOUR_UI::post_engine ()
/* start the time-of-day-clock */ /* start the time-of-day-clock */
#ifndef GTKOSX #ifndef __APPLE__
/* OS X provides a nearly-always visible wallclock, so don't be stupid */ /* OS X provides a nearly-always visible wallclock, so don't be stupid */
update_wall_clock (); update_wall_clock ();
Glib::signal_timeout().connect_seconds (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 1); Glib::signal_timeout().connect_seconds (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 1);

4
gtk2_ardour/ardour_ui_ed.cc
View file

@ -547,7 +547,7 @@ ARDOUR_UI::build_menu_bar ()
bool disk_space = false; bool disk_space = false;
if (!Profile->get_small_screen()) { if (!Profile->get_small_screen()) {
#ifndef GTKOSX #ifndef __APPLE__
// OSX provides its own wallclock, thank you very much // OSX provides its own wallclock, thank you very much
wall_clock = true; wall_clock = true;
#endif #endif
@ -571,7 +571,7 @@ ARDOUR_UI::build_menu_bar ()
menu_bar_base.set_name ("MainMenuBar"); menu_bar_base.set_name ("MainMenuBar");
menu_bar_base.add (menu_hbox); menu_bar_base.add (menu_hbox);
#ifndef GTKOSX #ifndef __APPLE__
_status_bar_visibility.add (&wall_clock_label, X_("WallClock"), _("Wall Clock"), wall_clock); _status_bar_visibility.add (&wall_clock_label, X_("WallClock"), _("Wall Clock"), wall_clock);
#endif #endif
_status_bar_visibility.add (&disk_space_label, X_("Disk"), _("Disk Space"), disk_space); _status_bar_visibility.add (&disk_space_label, X_("Disk"), _("Disk Space"), disk_space);

2
gtk2_ardour/editor.h
View file

@ -2015,7 +2015,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void cms_new (boost::shared_ptr<ARDOUR::Route>); void cms_new (boost::shared_ptr<ARDOUR::Route>);
void current_mixer_strip_hidden (); void current_mixer_strip_hidden ();
#ifdef GTKOSX #ifdef __APPLE__
void ensure_all_elements_drawn (); void ensure_all_elements_drawn ();
#endif #endif
/* nudging tracks */ /* nudging tracks */

2
gtk2_ardour/editor_canvas.cc
View file

@ -462,7 +462,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
snap_to (frame); snap_to (frame);
bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY); bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY);
#ifdef GTKOSX #ifdef __APPLE__
/* We are not allowed to call recursive main event loops from within /* We are not allowed to call recursive main event loops from within
the main event loop with GTK/Quartz. Since import/embed wants the main event loop with GTK/Quartz. Since import/embed wants
to push up a progress dialog, defer all this till we go idle. to push up a progress dialog, defer all this till we go idle.

8
gtk2_ardour/editor_mixer.cc
View file

@ -161,13 +161,13 @@ Editor::show_editor_mixer (bool yn)
} }
} }
#ifdef GTKOSX #ifdef __APPLE__
/* XXX gtk problem here */ /* XXX gtk problem here */
ensure_all_elements_drawn(); ensure_all_elements_drawn();
#endif #endif
} }
#ifdef GTKOSX #ifdef __APPLE__
void void
Editor::ensure_all_elements_drawn () Editor::ensure_all_elements_drawn ()
{ {
@ -185,7 +185,7 @@ Editor::create_editor_mixer ()
current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden)); current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden));
current_mixer_strip->WidthChanged.connect (sigc::mem_fun (*this, &Editor::mixer_strip_width_changed)); current_mixer_strip->WidthChanged.connect (sigc::mem_fun (*this, &Editor::mixer_strip_width_changed));
#ifdef GTKOSX #ifdef __APPLE__
current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn)); current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn));
#endif #endif
current_mixer_strip->set_embedded (true); current_mixer_strip->set_embedded (true);
@ -273,7 +273,7 @@ Editor::maybe_add_mixer_strip_width (XMLNode& node)
void void
Editor::mixer_strip_width_changed () Editor::mixer_strip_width_changed ()
{ {
#ifdef GTKOSX #ifdef __APPLE__
ensure_all_elements_drawn (); ensure_all_elements_drawn ();
#endif #endif

2
gtk2_ardour/editor_rulers.cc
View file

@ -439,7 +439,7 @@ Editor::update_ruler_visibility ()
double tbgpos = 0.0; double tbgpos = 0.0;
double old_unit_pos; double old_unit_pos;
#ifdef GTKOSX #ifdef __APPLE__
/* gtk update probs require this (damn) */ /* gtk update probs require this (damn) */
meter_label.hide(); meter_label.hide();
tempo_label.hide(); tempo_label.hide();

2
gtk2_ardour/keyboard.cc
View file

@ -38,7 +38,7 @@ using namespace PBD;
using namespace ARDOUR; using namespace ARDOUR;
using Gtkmm2ext::Keyboard; using Gtkmm2ext::Keyboard;
#ifdef GTKOSX #ifdef __APPLE__
guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier; guint ArdourKeyboard::constraint_mod = Keyboard::PrimaryModifier;
#else #else
guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier; guint ArdourKeyboard::constraint_mod = Keyboard::SecondaryModifier;

14
gtk2_ardour/mixer_ui.cc
View file

@ -228,7 +228,13 @@ Mixer_UI::Mixer_UI ()
list_vpacker.pack_start (rhs_pane2, true, true); list_vpacker.pack_start (rhs_pane2, true, true);
global_hpacker.pack_start (scroller, true, true); global_hpacker.pack_start (scroller, true, true);
#ifdef __APPLE__
/* current gtk-quartz has dirty updates on borders like this one */
global_hpacker.pack_start (out_packer, false, false, 0); global_hpacker.pack_start (out_packer, false, false, 0);
#else
global_hpacker.pack_start (out_packer, false, false, 12);
#endif
list_hpane.pack1(list_vpacker, false, true); list_hpane.pack1(list_vpacker, false, true);
list_hpane.pack2(global_hpacker, true, false); list_hpane.pack2(global_hpacker, true, false);
@ -1240,7 +1246,7 @@ Mixer_UI::strip_width_changed ()
{ {
_group_tabs->set_dirty (); _group_tabs->set_dirty ();
#ifdef GTKOSX #ifdef __APPLE__
TreeModel::Children rows = track_model->children(); TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i; TreeModel::Children::iterator i;
long order; long order;
@ -1345,7 +1351,7 @@ Mixer_UI::strip_property_changed (const PropertyChange& what_changed, MixerStrip
} }
} }
error << _("track display list item for renamed strip not found!") << endmsg; x error << _("track display list item for renamed strip not found!") << endmsg;
} }
bool bool
@ -1379,7 +1385,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
if (Keyboard::is_edit_event (ev)) { if (Keyboard::is_edit_event (ev)) {
if (group) { if (group) {
// edit_route_group (group); // edit_route_group (group);
#ifdef GTKOSX #ifdef __APPLE__
group_display.queue_draw(); group_display.queue_draw();
#endif #endif
return true; return true;
@ -1391,7 +1397,7 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
{ {
bool visible = (*iter)[group_columns.visible]; bool visible = (*iter)[group_columns.visible];
(*iter)[group_columns.visible] = !visible; (*iter)[group_columns.visible] = !visible;
#ifdef GTKOSX #ifdef __APPLE__
group_display.queue_draw(); group_display.queue_draw();
#endif #endif
return true; return true;

6
gtk2_ardour/plugin_ui.cc
View file

@ -178,7 +178,7 @@ PluginUIWindow::on_show ()
} }
if (_pluginui) { if (_pluginui) {
#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX) #if defined (HAVE_AUDIOUNITS) && defined(__APPLE__)
if (pre_deactivate_x >= 0) { if (pre_deactivate_x >= 0) {
move (pre_deactivate_x, pre_deactivate_y); move (pre_deactivate_x, pre_deactivate_y);
} }
@ -193,7 +193,7 @@ PluginUIWindow::on_show ()
void void
PluginUIWindow::on_hide () PluginUIWindow::on_hide ()
{ {
#if defined (HAVE_AUDIOUNITS) && defined(GTKOSX) #if defined (HAVE_AUDIOUNITS) && defined(__APPLE__)
get_position (pre_deactivate_x, pre_deactivate_y); get_position (pre_deactivate_x, pre_deactivate_y);
#endif #endif
@ -293,7 +293,7 @@ PluginUIWindow::create_audiounit_editor (boost::shared_ptr<PluginInsert>)
} }
void void
#ifdef GTKOSX #ifdef __APPLE__
PluginUIWindow::app_activated (bool yn) PluginUIWindow::app_activated (bool yn)
#else #else
PluginUIWindow::app_activated (bool) PluginUIWindow::app_activated (bool)

2
gtk2_ardour/processor_box.cc
View file

@ -1693,7 +1693,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
boost::weak_ptr<Processor>(processor))); boost::weak_ptr<Processor>(processor)));
} else if (processor && Keyboard::is_button2_event (ev) } else if (processor && Keyboard::is_button2_event (ev)
#ifndef GTKOSX #ifndef __APPLE__
&& (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK)) && (Keyboard::no_modifier_keys_pressed (ev) && ((ev->state & Gdk::BUTTON2_MASK) == Gdk::BUTTON2_MASK))
#endif #endif
) { ) {

17
gtk2_ardour/rc_option_editor.cc
View file

@ -327,7 +327,7 @@ static const struct {
{ "Unmodified", 0 }, { "Unmodified", 0 },
#ifdef GTKOSX #ifdef __APPLE__
/* Command = Meta /* Command = Meta
Option/Alt = Mod1 Option/Alt = Mod1
@ -515,7 +515,7 @@ public:
_copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen)); _copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_copy_modifier_combo, Gtkmm2ext::UI::instance()->set_tip (_copy_modifier_combo,
(string_compose (_("<b>Recommended Setting: %1</b>%2"), (string_compose (_("<b>Recommended Setting: %1</b>%2"),
#ifdef GTKOSX #ifdef __APPLE__
Keyboard::secondary_modifier_name (), Keyboard::secondary_modifier_name (),
#else #else
Keyboard::primary_modifier_name (), Keyboard::primary_modifier_name (),
@ -542,7 +542,7 @@ public:
_constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen)); _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo, Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
(string_compose (_("<b>Recommended Setting: %1</b>%2"), (string_compose (_("<b>Recommended Setting: %1</b>%2"),
#ifdef GTKOSX #ifdef __APPLE__
Keyboard::primary_modifier_name (), Keyboard::primary_modifier_name (),
#else #else
Keyboard::secondary_modifier_name (), Keyboard::secondary_modifier_name (),
@ -666,7 +666,7 @@ public:
/* ignore snap */ /* ignore snap */
set_popdown_strings (_snap_modifier_combo, dumb); set_popdown_strings (_snap_modifier_combo, dumb);
_snap_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_modifier_chosen)); _snap_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_modifier_chosen));
#ifdef GTKOSX #ifdef __APPLE__
Glib::ustring mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ()); Glib::ustring mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
#else #else
Glib::ustring mod_str = Keyboard::secondary_modifier_name(); Glib::ustring mod_str = Keyboard::secondary_modifier_name();
@ -692,7 +692,7 @@ public:
/* snap delta */ /* snap delta */
set_popdown_strings (_snap_delta_combo, dumb); set_popdown_strings (_snap_delta_combo, dumb);
_snap_delta_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_delta_modifier_chosen)); _snap_delta_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_delta_modifier_chosen));
#ifdef GTKOSX #ifdef __APPLE__
mod_str = Keyboard::level4_modifier_name (); mod_str = Keyboard::level4_modifier_name ();
#else #else
mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ()); mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::level4_modifier_name ());
@ -2902,7 +2902,12 @@ if (!Profile->get_mixbus()) {
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight) sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_name_highlight)
)); ));
add_option (S_("GUI"), #ifndef __APPLE__
/* font scaling does nothing with GDK/Quartz */
add_option (S_("Preferences|GUI"), new FontScalingOptions ());
#endif
add_option (S_("Preferences|GUI"),
new BoolOption ( new BoolOption (
"super-rapid-clock-update", "super-rapid-clock-update",
_("Update transport clock display at FPS instead of every 100ms"), _("Update transport clock display at FPS instead of every 100ms"),

6
gtk2_ardour/sfdb_ui.cc
View file

@ -560,7 +560,7 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
, gm (0) , gm (0)
{ {
#ifdef GTKOSX #ifdef __APPLE__
try { try {
/* add_shortcut_folder throws an exception if the folder being added already has a shortcut */ /* add_shortcut_folder throws an exception if the folder being added already has a shortcut */
chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops"); chooser.add_shortcut_folder_uri("file:///Library/GarageBand/Apple Loops");
@ -597,7 +597,7 @@ SoundFileBrowser::SoundFileBrowser (string title, ARDOUR::Session* s, bool persi
chooser.signal_update_preview().connect(sigc::mem_fun(*this, &SoundFileBrowser::update_preview)); chooser.signal_update_preview().connect(sigc::mem_fun(*this, &SoundFileBrowser::update_preview));
chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::chooser_file_activated)); chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SoundFileBrowser::chooser_file_activated));
#ifdef GTKOSX #ifdef __APPLE__
/* some broken redraw behaviour - this is a bandaid */ /* some broken redraw behaviour - this is a bandaid */
chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw)); chooser.signal_selection_changed().connect (mem_fun (chooser, &Widget::queue_draw));
#endif #endif
@ -1091,7 +1091,7 @@ SoundFileBrowser::freesound_search()
std::string theString = mootcher.searchText( std::string theString = mootcher.searchText(
search_string, search_string,
freesound_page, freesound_page,
#ifdef GTKOSX #ifdef __APPLE__
"", // OSX eats anything incl mp3 "", // OSX eats anything incl mp3
#else #else
"type:wav OR type:aiff OR type:flac OR type:aif OR type:ogg OR type:oga", "type:wav OR type:aiff OR type:flac OR type:aif OR type:ogg OR type:oga",

9
gtk2_ardour/wscript
View file

@ -475,13 +475,10 @@ def build(bld):
] ]
obj.install_path = bld.env['DLLDIR'] obj.install_path = bld.env['DLLDIR']
obj.linkflags = '' obj.linkflags = ''
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL GTKMM CANVAS FFTW3F LO TAGLIB '
obj.uselib += ' GTKMM CANVAS FFTW3F'
obj.uselib += ' AUDIOUNITS OSX GTKOSX LO '
obj.uselib += ' TAGLIB '
if sys.platform == 'darwin': if sys.platform == 'darwin':
obj.uselib += ' AUDIOUNITS OSX GTKOSX' obj.uselib += ' AUDIOUNITS OSX '
obj.use += ' libappleutility' obj.use += ' libappleutility'
obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ] obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ]
elif bld.env['build_target'] == 'mingw': elif bld.env['build_target'] == 'mingw':
@ -578,7 +575,7 @@ def build(bld):
base_font = "" base_font = ""
# Set up font sizes # Set up font sizes
if bld.is_defined('GTKOSX'): # OS X fonts if sys.platform == 'darwin':
basefont = "" basefont = ""
font_sizes = { font_sizes = {
'SMALLER' : '9', 'SMALLER' : '9',

2
wscript
View file

@ -846,9 +846,7 @@ def configure(conf):
conf.define ('HAVE_COREAUDIO', 1) conf.define ('HAVE_COREAUDIO', 1)
conf.define ('AUDIOUNIT_SUPPORT', 1) conf.define ('AUDIOUNIT_SUPPORT', 1)
conf.define ('GTKOSX', 1)
conf.define ('TOP_MENUBAR',1) conf.define ('TOP_MENUBAR',1)
conf.define ('GTKOSX',1)
# It would be nice to be able to use this to force back-compatibility with 10.4 # It would be nice to be able to use this to force back-compatibility with 10.4
# but even by the time of 11, the 10.4 SDK is no longer available in any normal # but even by the time of 11, the 10.4 SDK is no longer available in any normal