From d1be9b049de69bae970e7114294fa851a29f3247 Mon Sep 17 00:00:00 2001 From: Jamie Bullock Date: Wed, 10 Oct 2012 10:01:41 +0000 Subject: - clarified licensing svn path=/trunk/externals/postlude/; revision=16375 --- pluginhost~/handlers_osc.c | 36 ++++++++++++++++++++++++------------ pluginhost~/handlers_osc.h | 17 +++++------------ pluginhost~/handlers_pd.c | 41 ++++++++++++++++++++++++++++------------- pluginhost~/handlers_pd.h | 17 +++++------------ pluginhost~/ph_common.c | 36 ++++++++++++++++++++++++------------ pluginhost~/ph_common.h | 16 ++++------------ pluginhost~/pluginhost~.c | 17 ++++------------- 7 files changed, 94 insertions(+), 86 deletions(-) diff --git a/pluginhost~/handlers_osc.c b/pluginhost~/handlers_osc.c index 4114baf..a166331 100644 --- a/pluginhost~/handlers_osc.c +++ b/pluginhost~/handlers_osc.c @@ -1,16 +1,6 @@ /* pluginhost~ - A plugin host for Pd * - * Copyright (C) 2006 Jamie Bullock and others - * - * This file incorporates code from the following sources: - * - * jack-dssi-host (BSD-style license): Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - * - * Hexter (GPL license): Copyright (C) 2004 Sean Bolton and others. - * - * plugin~ (GPL license): Copyright (C) 2000 Jarno Seppänen, remIXed 2005 - * - * liblo (CPL license): Copyright (C) 2004 Steve Harris + * Copyright (C) 2012 Jamie Bullock and others * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +14,29 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + */ + + /* + * This file may include code from the following sources under the terms + * of the GNU GPL version 2: + * + * plugin~ Copyright (C) 2000 Jarno Seppänen, remIXed 2005 + * liblo 0.25 Copyright (C) 2004 Steve Harris + * + * This file may include code from jack-dssi-host under the terms of + * the following license: + * + * jack-dssi-host.c + * + * Copyright 2004, 2009 Chris Cannam, Steve Harris and Sean Bolton. + *· + * Permission to use, copy, modify, distribute, and sell this software + * for any purpose is hereby granted without fee, provided that the + * above copyright notice and this permission notice are included in + * all copies or substantial portions of the software. */ #include diff --git a/pluginhost~/handlers_osc.h b/pluginhost~/handlers_osc.h index a45c56a..d40037e 100644 --- a/pluginhost~/handlers_osc.h +++ b/pluginhost~/handlers_osc.h @@ -1,16 +1,6 @@ /* pluginhost~ - A plugin host for Pd * - * Copyright (C) 2006 Jamie Bullock and others - * - * This file incorporates code from the following sources: - * - * jack-dssi-host (BSD-style license): Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - * - * Hexter (GPL license): Copyright (C) 2004 Sean Bolton and others. - * - * plugin~ (GPL license): Copyright (C) 2000 Jarno Seppänen, remIXed 2005 - * - * liblo (CPL license): Copyright (C) 2004 Steve Harris + * Copyright (C) 2012 Jamie Bullock and others * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,9 +14,12 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * */ + #include "m_pd.h" #include "ph_common.h" diff --git a/pluginhost~/handlers_pd.c b/pluginhost~/handlers_pd.c index bf5fd45..e19b91b 100644 --- a/pluginhost~/handlers_pd.c +++ b/pluginhost~/handlers_pd.c @@ -1,16 +1,6 @@ -/* %s - A plugin host for Pd +/* pluginhost~ - A plugin host for Pd * - * Copyright (C) 2006 Jamie Bullock and others - * - * This file incorporates code from the following sources: - * - * jack-dssi-host (BSD-style license): Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - * - * Hexter (GPL license): Copyright (C) 2004 Sean Bolton and others. - * - * plugin~ (GPL license): Copyright (C) 2000 Jarno Seppänen, remIXed 2005 - * - * liblo (CPL license): Copyright (C) 2004 Steve Harris + * Copyright (C) 2012 Jamie Bullock and others * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,9 +14,34 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * */ + /* + * This file may include code from the following sources under the terms + * of the GNU GPL version 2: + * + * plugin~ Copyright (C) 2000 Jarno Seppänen, remIXed 2005 + * liblo 0.25 Copyright (C) 2004 Steve Harris + * + * This file may include code from jack-dssi-host under the terms of + * the following license: + * + * jack-dssi-host.c + * + * Copyright 2004, 2009 Chris Cannam, Steve Harris and Sean Bolton. + *· + * Permission to use, copy, modify, distribute, and sell this software + * for any purpose is hereby granted without fee, provided that the + * above copyright notice and this permission notice are included in + * all copies or substantial portions of the software. + */ + + + + #include #include #include diff --git a/pluginhost~/handlers_pd.h b/pluginhost~/handlers_pd.h index ec934da..bc195e2 100644 --- a/pluginhost~/handlers_pd.h +++ b/pluginhost~/handlers_pd.h @@ -1,16 +1,6 @@ /* pluginhost~ - A plugin host for Pd * - * Copyright (C) 2006 Jamie Bullock and others - * - * This file incorporates code from the following sources: - * - * jack-dssi-host (BSD-style license): Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - * - * Hexter (GPL license): Copyright (C) 2004 Sean Bolton and others. - * - * plugin~ (GPL license): Copyright (C) 2000 Jarno Seppänen, remIXed 2005 - * - * liblo (CPL license): Copyright (C) 2004 Steve Harris + * Copyright (C) 2012 Jamie Bullock and others * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,9 +14,12 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * */ + #include "m_pd.h" #include "ph_common.h" diff --git a/pluginhost~/ph_common.c b/pluginhost~/ph_common.c index 2915b15..b81e276 100644 --- a/pluginhost~/ph_common.c +++ b/pluginhost~/ph_common.c @@ -1,16 +1,6 @@ /* pluginhost~ - A plugin host for Pd * - * Copyright (C) 2006 Jamie Bullock and others - * - * This file incorporates code from the following sources: - * - * jack-dssi-host (BSD-style license): Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - * - * Hexter (GPL license): Copyright (C) 2004 Sean Bolton and others. - * - * plugin~ (GPL license): Copyright (C) 2000 Jarno Seppänen, remIXed 2005 - * - * liblo (CPL license): Copyright (C) 2004 Steve Harris + * Copyright (C) 2012 Jamie Bullock and others * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +14,29 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + */ + + /* + * This file may include code from the following sources under the terms + * of the GNU GPL version 2: + * + * plugin~ Copyright (C) 2000 Jarno Seppänen, remIXed 2005 + * liblo 0.25 Copyright (C) 2004 Steve Harris + * + * This file may include code from jack-dssi-host under the terms of + * the following license: + * + * jack-dssi-host.c + * + * Copyright 2004, 2009 Chris Cannam, Steve Harris and Sean Bolton. + *· + * Permission to use, copy, modify, distribute, and sell this software + * for any purpose is hereby granted without fee, provided that the + * above copyright notice and this permission notice are included in + * all copies or substantial portions of the software. */ #include diff --git a/pluginhost~/ph_common.h b/pluginhost~/ph_common.h index a3d57a9..d8cbe54 100644 --- a/pluginhost~/ph_common.h +++ b/pluginhost~/ph_common.h @@ -1,16 +1,6 @@ /* pluginhost~ - A plugin host for Pd * - * Copyright (C) 2006 Jamie Bullock and others - * - * This file incorporates code from the following sources: - * - * jack-dssi-host (BSD-style license): Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - * - * Hexter (GPL license): Copyright (C) 2004 Sean Bolton and others. - * - * plugin~ (GPL license): Copyright (C) 2000 Jarno Seppänen, remIXed 2005 - * - * liblo (CPL license): Copyright (C) 2004 Steve Harris + * Copyright (C) 2012 Jamie Bullock and others * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,7 +14,9 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * */ #include diff --git a/pluginhost~/pluginhost~.c b/pluginhost~/pluginhost~.c index 76faff1..c0c9bd9 100644 --- a/pluginhost~/pluginhost~.c +++ b/pluginhost~/pluginhost~.c @@ -1,16 +1,6 @@ /* pluginhost~ - A plugin host for Pd * - * Copyright (C) 2006 Jamie Bullock and others - * - * This file incorporates code from the following sources: - * - * jack-dssi-host (BSD-style license): Copyright 2004 Chris Cannam, Steve Harris and Sean Bolton. - * - * Hexter (GPL license): Copyright (C) 2004 Sean Bolton and others. - * - * plugin~ (GPL license): Copyright (C) 2000 Jarno Seppänen, remIXed 2005 - * - * liblo (CPL license): Copyright (C) 2004 Steve Harris + * Copyright (C) 2012 Jamie Bullock and others * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -24,10 +14,11 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * */ - #include #include -- cgit v1.2.1