projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
workaround changes in glibmm 2.49.x
[ardour.git]
/
gtk2_ardour
/
startup.cc
diff --git
a/gtk2_ardour/startup.cc
b/gtk2_ardour/startup.cc
index e020ee18d7e4eb5170febe5624ed6c3989edbd22..12f98916bf30188048617390943b32bebd83cf7f 100644
(file)
--- a/
gtk2_ardour/startup.cc
+++ b/
gtk2_ardour/startup.cc
@@
-22,11
+22,10
@@
#include "gtk2ardour-version.h"
#endif
#include "gtk2ardour-version.h"
#endif
-#include <fstream>
#include <algorithm>
#include <fcntl.h>
#include <algorithm>
#include <fcntl.h>
-#include
<pbd/gstdio_compat.h>
+#include
"pbd/gstdio_compat.h"
#include <gtkmm/main.h>
#include <gtkmm/filechooser.h>
#include <gtkmm/main.h>
#include <gtkmm/filechooser.h>
@@
-47,11
+46,12
@@
#include "ardour/session.h"
#include "ardour/session_state_utils.h"
#include "ardour/template_utils.h"
#include "ardour/session.h"
#include "ardour/session_state_utils.h"
#include "ardour/template_utils.h"
+#include "ardour/profile.h"
#include "startup.h"
#include "opts.h"
#include "engine_dialog.h"
#include "startup.h"
#include "opts.h"
#include "engine_dialog.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
#include "utils.h"
using namespace std;
#include "utils.h"
using namespace std;
@@
-80,23
+80,23
@@
ArdourStartup::ArdourStartup ()
set_position (WIN_POS_CENTER);
set_border_width (12);
set_position (WIN_POS_CENTER);
set_border_width (12);
- if (
(icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0
) {
+ if (
! (icon_pixbuf = ::get_icon (PROGRAM_NAME "-icon_48px"))
) {
throw failed_constructor();
}
list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
Glib::RefPtr<Gdk::Pixbuf> icon;
throw failed_constructor();
}
list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
Glib::RefPtr<Gdk::Pixbuf> icon;
- if ((icon = ::get_icon (
"ardour_icon_16px")) != 0
) {
+ if ((icon = ::get_icon (
PROGRAM_NAME "-icon_16px"))
) {
window_icons.push_back (icon);
}
window_icons.push_back (icon);
}
- if ((icon = ::get_icon (
"ardour_icon_22px")) != 0
) {
+ if ((icon = ::get_icon (
PROGRAM_NAME "-icon_22px"))
) {
window_icons.push_back (icon);
}
window_icons.push_back (icon);
}
- if ((icon = ::get_icon (
"ardour_icon_32px")) != 0
) {
+ if ((icon = ::get_icon (
PROGRAM_NAME "-icon_32px"))
) {
window_icons.push_back (icon);
}
window_icons.push_back (icon);
}
- if ((icon = ::get_icon (
"ardour_icon_48px")) != 0
) {
+ if ((icon = ::get_icon (
PROGRAM_NAME "-icon_48px"))
) {
window_icons.push_back (icon);
}
if (!window_icons.empty ()) {
window_icons.push_back (icon);
}
if (!window_icons.empty ()) {
@@
-358,7
+358,9
@@
ArdourStartup::setup_final_page ()
VBox* vbox = manage (new VBox);
vbox->pack_start (*final_label, true, true);
VBox* vbox = manage (new VBox);
vbox->pack_start (*final_label, true, true);
- vbox->pack_start (plugin_disco_button, true, false);
+ if (!Profile->get_mixbus()) {
+ vbox->pack_start (plugin_disco_button, true, false);
+ }
vbox->show ();
final_page_index = append_page (*vbox);
vbox->show ();
final_page_index = append_page (*vbox);