[SCM] calf/master: + GUI: removed support for phat (to avoid breaking LV2 GUI and to stick to single license - LGPL)
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:37:01 UTC 2013
The following commit has been merged in the master branch:
commit 2b975f5e59417154a4144ee1290800a4e4f03311
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date: Thu Jan 17 20:14:53 2008 +0000
+ GUI: removed support for phat (to avoid breaking LV2 GUI and to stick to single license - LGPL)
git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@111 78b06b96-2940-0410-b7fc-879d825d01d8
diff --git a/INSTALL b/INSTALL
index c5337e9..d375f97 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,6 +3,7 @@ Installation Instructions
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
+Copyright (C) 2007-2008 Krzysztof Foltman
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -15,8 +16,12 @@ To compile and install Calf, you need:
- POSIX-compliant operating system
- G++ version 4.0 or higher (tested with 4.1.3)
- GTK+2 headers and libraries (glib 2.10, gtk+ 2.12)
-- JACK header and libraries (tested with 0.107.5)
-- SVN version of phat toolkit - http://phat.berlios.de/
+
+Optional but recommended:
+- JACK header and libraries (tested with 0.109.0)
+- LADSPA header
+- DSSI header
+- LV2 core
Basic Installation
==================
diff --git a/config.h.in b/config.h.in
index 173cd00..3ddb973 100644
--- a/config.h.in
+++ b/config.h.in
@@ -24,9 +24,6 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define to 1 if you have the <phat/phatknob.h> header file. */
-#undef HAVE_PHAT_PHATKNOB_H
-
/* Define to 1 if you have the `pow' function. */
#undef HAVE_POW
@@ -105,9 +102,6 @@
/* GTK+ GUI for LV2 plugins will be built */
#undef USE_LV2_GUI
-/* PHAT widget library will be used */
-#undef USE_PHAT
-
/* Version number of package */
#undef VERSION
diff --git a/configure.ac b/configure.ac
index 591d4ee..8bcb960 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,6 @@ AC_SUBST(JACK_DEPS_LIBS)
PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 1, LV2_ENABLED="yes", LV2_ENABLED="no")
PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.5.0, LASH_ENABLED="yes", LASH_ENABLED="no")
-PHAT_ENABLED="no"
if test "$JACK_FOUND" = "yes" -o "$DSSI_FOUND" = "yes" -o "$LV2_ENABLED" = "yes"; then
PKG_CHECK_MODULES(GUI_DEPS, gtk+-2.0 >= 2.8.0 libglade-2.0 >= 2.4.0 cairo >= 1.2.0,
GUI_ENABLED="yes",
@@ -85,19 +84,6 @@ else
LV2_GUI_ENABLED="no"
fi
-AC_ARG_ENABLE(phat, [ --disable-phat to disable usage of PHAT widget set], [], [
- PKG_CHECK_MODULES(PHAT_DEPS, phat >= 0.4.1,
- [
- CFLAGS="$CFLAGS $GUI_DEPS_CFLAGS $JACK_DEPS_CFLAGS"
- CPPFLAGS="$CPPFLAGS $GUI_DEPS_CFLAGS $JACK_DEPS_CFLAGS"
- AC_CHECK_HEADERS([phat/phatknob.h],
- PHAT_ENABLED="yes",
- PHAT_ENABLED="no (phat library is too old, SVN version required)")
- ],
- PHAT_ENABLED="no"
- )
-])
-
AC_MSG_CHECKING([whether to enable experimental/unfinished features])
AC_ARG_ENABLE(experimental,
AC_HELP_STRING([--enable-experimental],[enable unfinished features - not recommended!]),
@@ -113,7 +99,6 @@ AM_CONDITIONAL(USE_LV2, test "$LV2_ENABLED" = "yes")
AM_CONDITIONAL(USE_GUI, test "$GUI_ENABLED" = "yes")
AM_CONDITIONAL(USE_DSSI_GUI, test "$DSSI_GUI_ENABLED" = "yes")
AM_CONDITIONAL(USE_LV2_GUI, test "$LV2_GUI_ENABLED" = "yes")
-AM_CONDITIONAL(USE_PHAT, test "$PHAT_ENABLED" = "yes")
AM_CONDITIONAL(USE_LASH, test "$LASH_ENABLED" = "yes")
if test "$LADSPA_FOUND" = "yes"; then
AC_DEFINE([USE_LADSPA], [1], [LADSPA wrapper will be built])
@@ -133,9 +118,6 @@ fi
if test "$JACK_ENABLED" = "yes"; then
AC_DEFINE(USE_JACK, 1, [JACK I/O will be used])
fi
-if test "$PHAT_ENABLED" = "yes"; then
- AC_DEFINE(USE_PHAT, 1, [PHAT widget library will be used])
-fi
if test "$OLD_JACK" = "yes"; then
AC_DEFINE(OLD_JACK, 1, [Old JACK version (with extra nframes argument) is to be used])
fi
@@ -210,7 +192,6 @@ AC_MSG_RESULT([
JACK host enabled: $JACK_ENABLED
LASH enabled: $LASH_ENABLED
Old-style JACK MIDI: $OLD_JACK
- PHAT GUI enabled: $PHAT_ENABLED
Installation prefix: $prefix
])
diff --git a/src/Makefile.am b/src/Makefile.am
index 4effbb8..e7b7c8c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,9 +26,6 @@ noinst_LTLIBRARIES += libcalfgui.la
bin_PROGRAMS += calfjackhost
calfjackhost_SOURCES = jackhost.cpp
calfjackhost_LDADD = libcalfgui.la libcalfstatic.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS)
-if USE_PHAT
-calfjackhost_LDADD += $(PHAT_DEPS_LIBS)
-endif
if USE_LASH
AM_CXXFLAGS += $(LASH_DEPS_CFLAGS)
calfjackhost_LDADD += $(LASH_DEPS_LIBS)
@@ -45,9 +42,6 @@ calfbenchmark_LDADD = -lglib-2.0
if USE_DSSI_GUI
calfdssigui_SOURCES = dssigui.cpp
calfdssigui_LDADD = -lglib-2.0 libcalfstatic.la libcalfgui.la $(GUI_DEPS_LIBS)
-if USE_PHAT
-calfdssigui_LDADD += $(PHAT_DEPS_LIBS)
-endif
endif
calf_la_SOURCES = modules.cpp giface.cpp monosynth.cpp organ.cpp preset.cpp synth.cpp
@@ -56,9 +50,6 @@ calf_la_LDFLAGS = -rpath $(ladspadir) -avoid-version -module -lexpat -export-sym
if USE_LV2_GUI
calflv2gui_la_SOURCES = gui.cpp custom_ctl.cpp modules.cpp giface.cpp monosynth.cpp organ.cpp preset.cpp synth.cpp lv2gui.cpp
calflv2gui_la_LDFLAGS = -rpath $(lv2dir) -avoid-version -module -lexpat -export-symbols-regex "lv2_gui_descriptor" $(GUI_DEPS_LIBS)
-if USE_PHAT
-calflv2gui_la_LIBADD = $(PHAT_DEPS_LIBS)
-endif
endif
libcalfstatic_la_SOURCES = modules.cpp giface.cpp monosynth.cpp organ.cpp preset.cpp synth.cpp
diff --git a/src/calf/gui.h b/src/calf/gui.h
index ae53cdb..b598fa8 100644
--- a/src/calf/gui.h
+++ b/src/calf/gui.h
@@ -2,22 +2,20 @@
* Universal GUI module
* Copyright (C) 2007 Krzysztof Foltman
*
- * Note: This module uses phat graphics library, so it's
- * licensed under GPL license, not LGPL.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#ifndef __CALF_GUI_H
#define __CALF_GUI_H
@@ -27,9 +25,6 @@
#include <set>
#include <vector>
#include <gtk/gtk.h>
-#if USE_PHAT
-#include <phat/phatknob.h>
-#endif
#include "custom_ctl.h"
namespace synth {
@@ -188,11 +183,7 @@ struct line_graph_param_control: public param_control
struct knob_param_control: public param_control
{
-#if USE_PHAT
- PhatKnob *knob;
-#else
CalfKnob *knob;
-#endif
virtual GtkWidget *create(plugin_gui *_gui, int _param_no);
virtual void get();
@@ -233,10 +224,6 @@ public:
void set_param_value(int param_no, float value, param_control *originator = NULL);
static void xml_element_start(void *data, const char *element, const char *attributes[]);
static void xml_element_end(void *data, const char *element);
-
-#if USE_PHAT
- static void knob_value_changed(PhatKnob *widget, gpointer value);
-#endif
};
class plugin_gui_window
diff --git a/src/gui.cpp b/src/gui.cpp
index d9a04b6..232a9b7 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -2,22 +2,20 @@
* GUI functions for a plugin.
* Copyright (C) 2007 Krzysztof Foltman
*
- * Note: This module uses phat graphics library, so it's
- * licensed under GPL license, not LGPL.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#include <config.h>
@@ -251,22 +249,6 @@ void toggle_param_control::set()
// knob
-#if USE_PHAT
-GtkWidget *knob_param_control::create(plugin_gui *_gui, int _param_no)
-{
- gui = _gui;
- param_no = _param_no;
- const parameter_properties &props = get_props();
-
- float increment = props.get_increment();
- widget = phat_knob_new_with_range (props.to_01 (gui->plugin->get_param_value(param_no)), 0, 1, increment);
- gtk_widget_set_size_request(widget, 50, 50);
- gtk_signal_connect(GTK_OBJECT(widget), "value-changed", G_CALLBACK(knob_value_changed), (gpointer)this);
- return widget;
-}
-
-#else
-
GtkWidget *knob_param_control::create(plugin_gui *_gui, int _param_no)
{
gui = _gui;
@@ -282,16 +264,10 @@ GtkWidget *knob_param_control::create(plugin_gui *_gui, int _param_no)
return widget;
}
-#endif
-
void knob_param_control::get()
{
const parameter_properties &props = get_props();
-#if USE_PHAT
- float value = props.from_01(phat_knob_get_value(PHAT_KNOB(widget)));
-#else
float value = props.from_01(gtk_range_get_value(GTK_RANGE(widget)));
-#endif
gui->set_param_value(param_no, value, this);
if (label)
update_label();
@@ -301,11 +277,7 @@ void knob_param_control::set()
{
_GUARD_CHANGE_
const parameter_properties &props = get_props();
-#if USE_PHAT
- phat_knob_set_value(PHAT_KNOB(widget), props.to_01 (gui->plugin->get_param_value(param_no)));
-#else
gtk_range_set_value(GTK_RANGE(widget), props.to_01 (gui->plugin->get_param_value(param_no)));
-#endif
if (label)
update_label();
}
diff --git a/src/jackhost.cpp b/src/jackhost.cpp
index 416df4b..b697541 100644
--- a/src/jackhost.cpp
+++ b/src/jackhost.cpp
@@ -2,22 +2,20 @@
* Standalone application module wrapper example.
* Copyright (C) 2007 Krzysztof Foltman
*
- * Note: This module uses phat graphics library, so it's
- * licensed under GPL license, not LGPL.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser 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 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#include <set>
#include <getopt.h>
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list