Permalink
Browse files

Replace GUI.cc with MainMenu.cpp & MainWindow.cpp, remove GTKMM depen…

…decy
  • Loading branch information...
nickdowell committed Jun 22, 2017
1 parent 33ccd02 commit 63c2f0a4631b3d768d4c2b099864dfdcbdfa0a6b
Showing with 1,036 additions and 1,329 deletions.
  1. +10 −9 CMakeLists.txt
  2. +7 −6 Makefile.am
  3. +0 −12 README
  4. +0 −7 configure.ac
  5. +0 −1,067 src/GUI/GUI.cc
  6. +0 −157 src/GUI/GUI.h
  7. +3 −2 src/GUI/MIDILearnDialog.cpp
  8. +676 −0 src/GUI/MainMenu.cpp
  9. +24 −0 src/GUI/MainMenu.h
  10. +275 −0 src/GUI/MainWindow.cpp
  11. +7 −9 src/GUI/{Request.h → MainWindow.h}
  12. +26 −53 src/GUI/gui_main.cc
  13. +7 −5 src/GUI/gui_main.h
  14. +0 −1 src/PresetController.h
  15. +1 −1 src/main.cc
View
@@ -40,9 +40,9 @@ if (JACK_FOUND)
include_directories(${JACK_INCLUDE_DIRS})
endif (JACK_FOUND)
pkg_check_modules(GTKMM gtkmm-2.4)
pkg_check_modules(GTK gtk+-2.0)
add_compile_options(-DWITH_GUI)
include_directories(${GTKMM_INCLUDE_DIRS})
include_directories(${GTK_INCLUDE_DIRS})
pkg_check_modules(LASH lash-1.0)
if (LASH_FOUND)
@@ -139,15 +139,16 @@ add_executable(amsynth
src/GUI/editor_menus.h
src/GUI/editor_pane.c
src/GUI/editor_pane.h
src/GUI/GUI.cc
src/GUI/GUI.h
src/GUI/gui_main.cc
src/GUI/gui_main.h
src/GUI/MainMenu.cpp
src/GUI/MainMenu.h
src/GUI/MainWindow.cpp
src/GUI/MainWindow.h
src/GUI/MIDILearnDialog.cpp
src/GUI/MIDILearnDialog.h
src/GUI/PresetControllerView.cc
src/GUI/PresetControllerView.h
src/GUI/Request.h
src/AudioOutput.cc
src/AudioOutput.h
src/JackOutput.cc
@@ -163,7 +164,7 @@ target_link_libraries(amsynth
amsynth_core
${ALSA_LIBRARIES}
${JACK_LIBRARIES}
${GTKMM_LIBRARIES}
${GTK_LIBRARIES}
${LASH_LIBRARIES}
)
@@ -192,7 +193,7 @@ add_executable(amsynth_dssi_gtk
target_link_libraries(amsynth_dssi_gtk
amsynth_core
${GTKMM_LIBRARIES}
${GTK_LIBRARIES}
${LIBLO_LIBRARIES}
)
@@ -220,7 +221,7 @@ add_library(amsynth_lv2_gtk MODULE
src/amsynth_lv2_ui_gtk.cpp
)
set_target_properties(amsynth_lv2_gtk PROPERTIES PREFIX "")
target_link_libraries(amsynth_lv2_gtk amsynth_core ${GTKMM_LIBRARIES})
target_link_libraries(amsynth_lv2_gtk amsynth_core ${GTK_LIBRARIES})
add_dependencies(amsynth_lv2 amsynth_lv2_gtk)
@@ -240,7 +241,7 @@ add_library(amsynth_vst MODULE
)
target_compile_options(amsynth_vst PUBLIC -DWITH_GUI)
set_target_properties(amsynth_vst PROPERTIES PREFIX "")
target_link_libraries(amsynth_vst amsynth_core ${GTKMM_LIBRARIES})
target_link_libraries(amsynth_vst amsynth_core ${GTK_LIBRARIES})
add_executable(amsynth_tests src/tests.cpp)
View
@@ -114,24 +114,25 @@ amsynth_SOURCES = \
src/main.h \
src/main.cc
amsynth_CPPFLAGS = $(AM_CPPFLAGS) @ALSA_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @SNDFILE_CFLAGS@ @GTKMM_CFLAGS@
amsynth_CPPFLAGS = $(AM_CPPFLAGS) @ALSA_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @SNDFILE_CFLAGS@ @GTK_CFLAGS@
amsynth_LDADD = @ALSA_LIBS@ @JACK_LIBS@ @LASH_LIBS@ @SNDFILE_LIBS@ @LIBS@
if BUILD_GUI
amsynth_SOURCES += $(libgui_sources) \
src/GUI/ConfigDialog.cpp \
src/GUI/ConfigDialog.h \
src/GUI/GUI.cc \
src/GUI/GUI.h \
src/GUI/gui_main.cc \
src/GUI/gui_main.h \
src/GUI/MainMenu.cpp \
src/GUI/MainMenu.h \
src/GUI/MainWindow.cpp \
src/GUI/MainWindow.h \
src/GUI/MIDILearnDialog.cpp \
src/GUI/MIDILearnDialog.h \
src/GUI/PresetControllerView.cc \
src/GUI/PresetControllerView.h \
src/GUI/Request.h
amsynth_LDADD += @GTKMM_LIBS@
src/GUI/PresetControllerView.h
amsynth_LDADD += @GTK_LIBS@
endif
if DARWIN
View
12 README
@@ -41,15 +41,3 @@ Any valid preset banks that are found in these directories will be show in the
drop-down bank selector on the GUI (standalone version only.)
Plug-in versions can load presets by right-clicking on the GUI's background.
Building on Fedora 23 / latest gtkmm
------------------------------------
The latest versions of gtkmm require C++11 support, but it is not enabled by
default in current versions of GCC.
If you encounter build errors relating to C++11 support, please configure
the build like so:
./configure CXXFLAGS='-std=c++11'
View
@@ -60,12 +60,6 @@ AC_CHECK_LIB(pthread, pthread_create, [], exit)
AS_IF([test "x$with_gui" != "xno"],[PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.0])])
dnl ## http://www.gtkmm.org/docs/gtkmm-2.4/docs/reference/html/newin2p6s.html
dnl ## we use the following APIs only available in gtkmm 2.6 and up:
dnl ## Gtk::MessageDialog::set_secondary_text()
dnl ## Gtk::AboutDialog
AS_IF([test "x$with_gui" != "xno"],[PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 >= 2.6.0])])
dnl ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dnl
dnl Optional packages
@@ -189,7 +183,6 @@ echo -------------------------------------------------------- $PACKAGE $VERSION
echo \|
AS_IF([test "x$with_gui" != "xno"], [
echo \| GTK version........................................... : `pkg-config --modversion gtk+-2.0`
echo \| GTK-- version......................................... : `pkg-config --modversion gtkmm-2.4`
])
echo \| Build with GUI support................................ : $with_gui
echo \|
Oops, something went wrong.

0 comments on commit 63c2f0a

Please sign in to comment.