Remove Gtk2 interface

9 files changed, 4 insertions, 118 deletions

diff --git a/NEWS b/NEWS
index 11e65a8..df8bb4b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
 jalv (1.6.9) stable; urgency=medium
 
   * Build Qt UI with -fPIC
+  * Remove Gtk2 interface
   * Switch to external zix dependency
 
- -- David Robillard <d@drobilla.net>  Sat, 19 Nov 2022 10:51:27 +0000
+ -- David Robillard <d@drobilla.net>  Sun, 11 Dec 2022 18:52:53 +0000
 
 jalv (1.6.8) stable; urgency=medium
 
diff --git a/doc/jalv.1 b/doc/jalv.1
index 91976b2..068596c 100644
--- a/doc/jalv.1
+++ b/doc/jalv.1
@@ -48,7 +48,7 @@ Print control output changes to stdout.
 \fB\-s\fR
 Show plugin UI if possible.
 
-This option only works when plugins provide a UI that is usable via the non-embeddable showHide interface.  For other, embeddable UIs, use jalv.gtk(1) or jalv.qt(1).
+This option only works when plugins provide a UI that is usable via the non-embeddable showHide interface.  For other, embeddable UIs, use jalv.gtk3(1) or jalv.qt5(1).
 
 .TP
 \fB\-t\fR
@@ -72,7 +72,6 @@ The Jalv prompt supports several commands for interactive control:
   \fBSYMBOL = VALUE\fR    Set control value by symbol
 
 .SH "SEE ALSO"
-.BR jalv.gtk(1),
 .BR jalv.gtk3(1),
 .BR jalv.qt5(2),
 .BR lv2ls(1),
diff --git a/doc/jalv.gtk.1 b/doc/jalv.gtk.1
deleted file mode 100644
index cabe37f..0000000
--- a/doc/jalv.gtk.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.TH JALV.GTK 1 "18 Feb 2017"
-
-.SH NAME
-.B jalv.gtk \- Run an LV2 plugin as a JACK application (Gtk version).
-
-.SH SYNOPSIS
-.B jalv.gtk [OPTION]... PLUGIN_URI
-
-.SH OPTIONS
-
-.TP
-\fB\-b SIZE\fR
-Buffer size for plugin <=> UI communication.
-
-.TP
-\fB\-c SYM=VAL\fR
-Set control value (e.g. "vol=1.4").
-
-.TP
-\fB\-d\fR, \fB\-\-dump\fR
-Dump plugin <=> UI communication.
-
-.TP
-\fB\-U URI\fR
-Load the UI with the given URI.
-
-.TP
-\fB\-g\fR, \fB\-\-generic\-ui\fR
-Use Jalv generic UI and not the plugin UI.
-
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Print the command line options.
-
-.TP
-\fB\-l DIR\fR, \fB\-\-load DIR\fR
-Load state from state directory.
-
-.TP
-\fB\-p\fR, \fB\-\-print\-controls\fR
-Print control output changes to stdout.
-
-.TP
-\fB\-t\fR, \fB\-\-trace\fR
-Print trace messages from plugin.
-
-.SH "SEE ALSO"
-.BR jalv(1),
-.BR jalv.gtk3(1),
-.BR jalv.qt5(1),
-.BR lv2ls(1),
-.BR jackd(1)
-
-.SH AUTHOR
-jalv was written by David Robillard <d@drobilla.net>
-.PP
-This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz>
-and David Robillard <d@drobilla.net>
diff --git a/doc/jalv.gtk3.1 b/doc/jalv.gtk3.1
index e9da7e4..1cb8dc1 100644
--- a/doc/jalv.gtk3.1
+++ b/doc/jalv.gtk3.1
@@ -46,7 +46,6 @@ Print trace messages from plugin.
 
 .SH "SEE ALSO"
 .BR jalv(1),
-.BR jalv.gtk(1),
 .BR jalv.qt5(1),
 .BR lv2ls(1),
 .BR jackd(1)
diff --git a/doc/jalv.qt5.1 b/doc/jalv.qt5.1
index 14429fb..14fa57f 100644
--- a/doc/jalv.qt5.1
+++ b/doc/jalv.qt5.1
@@ -13,7 +13,6 @@ developer testing purposes, for a production ready program use jalv.gtk.
 
 .SH "SEE ALSO"
 .BR jalv(1),
-.BR jalv.gtk(1),
 .BR jalv.gtk3(1),
 .BR lv2ls(1),
 .BR jackd(1)
diff --git a/doc/meson.build b/doc/meson.build
index 6a0781c..64299d1 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -3,10 +3,6 @@
 
 install_man('jalv.1')
 
-if not get_option('gtk2').disabled()
-  install_man('jalv.gtk.1')
-endif
-
 if not get_option('gtk3').disabled()
   install_man('jalv.gtk3.1')
 endif
diff --git a/meson.build b/meson.build
index c2130c4..29a4194 100644
--- a/meson.build
+++ b/meson.build
@@ -311,30 +311,6 @@ executable(
   install: true,
 )
 
-# Gtk 2.0 GUI version
-if not get_option('gtk2').disabled()
-  gdk2_dep = dependency('gdk-2.0',
-                        version: '>= 2.18.0',
-                        include_type: 'system',
-                        required: get_option('gtk2'))
-
-  gtk2_dep = dependency('gtk+-2.0',
-                        version: '>= 2.18.0',
-                        include_type: 'system',
-                        required: get_option('gtk2'))
-
-  if gdk2_dep.found() and gtk2_dep.found()
-    executable(
-      'jalv.gtk',
-      sources + files('src/jalv_gtk.c'),
-      c_args: c_suppressions + platform_defines + suil_defines,
-      dependencies: common_dependencies + [gdk2_dep, gtk2_dep, suil_dep],
-      include_directories: include_directories('src'),
-      install: true,
-    )
-  endif
-endif
-
 # Gtk 3.0 GUI version
 if not get_option('gtk3').disabled()
   gdk3_dep = dependency(
diff --git a/meson_options.txt b/meson_options.txt
index 9cdbe2f..d420bf2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,9 +4,6 @@ option('checks', type: 'boolean', value: true, yield: true,
 option('cxx', type: 'feature', value: 'auto', yield: true,
        description: 'Build C++ programs')
 
-option('gtk2', type: 'feature', value: 'auto', yield: true,
-       description: 'Build Gtk2 GUI')
-
 option('gtk3', type: 'feature', value: 'auto', yield: true,
        description: 'Build Gtk3 GUI')
 
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c
index e89d7a6..881c5f5 100644
--- a/src/jalv_gtk.c
+++ b/src/jalv_gtk.c
@@ -72,34 +72,21 @@ get_float(const LilvNode* node, float fallback)
 static GtkWidget*
 new_box(gboolean horizontal, gint spacing)
 {
-#if GTK_MAJOR_VERSION == 3
   return gtk_box_new(horizontal ? GTK_ORIENTATION_HORIZONTAL
                                 : GTK_ORIENTATION_VERTICAL,
                      spacing);
-#else
-  return (horizontal ? gtk_hbox_new(FALSE, spacing)
-                     : gtk_vbox_new(FALSE, spacing));
-#endif
 }
 
 static GtkWidget*
 new_hscale(gdouble min, gdouble max, gdouble step)
 {
-#if GTK_MAJOR_VERSION == 3
   return gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, min, max, step);
-#else
-  return gtk_hscale_new_with_range(min, max, step);
-#endif
 }
 
 static void
 size_request(GtkWidget* widget, GtkRequisition* req)
 {
-#if GTK_MAJOR_VERSION == 3
   gtk_widget_get_preferred_size(widget, NULL, req);
-#else
-  gtk_widget_size_request(widget, req);
-#endif
 }
 
 static void
@@ -237,9 +224,7 @@ jalv_frontend_init(int* argc, char*** argv, JalvOptions* opts)
 const char*
 jalv_frontend_ui_type(void)
 {
-#if GTK_MAJOR_VERSION == 2
-  return "http://lv2plug.in/ns/extensions/ui#GtkUI";
-#elif GTK_MAJOR_VERSION == 3
+#if GTK_MAJOR_VERSION == 3
   return "http://lv2plug.in/ns/extensions/ui#Gtk3UI";
 #else
   return NULL;
@@ -1346,29 +1331,21 @@ jalv_frontend_discover(Jalv* ZIX_UNUSED(jalv))
 float
 jalv_frontend_refresh_rate(Jalv* ZIX_UNUSED(jalv))
 {
-#if GTK_MAJOR_VERSION == 2
-  return 30.0f;
-#else
   GdkDisplay* const display = gdk_display_get_default();
   GdkMonitor* const monitor = gdk_display_get_primary_monitor(display);
 
   const float rate = (float)gdk_monitor_get_refresh_rate(monitor);
 
   return rate < 30.0f ? 30.0f : rate;
-#endif
 }
 
 float
 jalv_frontend_scale_factor(Jalv* ZIX_UNUSED(jalv))
 {
-#if GTK_MAJOR_VERSION == 2
-  return 1.0f;
-#else
   GdkDisplay* const display = gdk_display_get_default();
   GdkMonitor* const monitor = gdk_display_get_primary_monitor(display);
 
   return (float)gdk_monitor_get_scale_factor(monitor);
-#endif
 }
 
 static void