From 46ccca220dfc83c3bcbe4d13c21990f3827e07e4 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Sun, 9 Feb 2014 12:21:24 +0100 Subject: license change in artwork and hotkeys, with permission from contributors --- plugins/artwork/COPYING | 26 ++++++++++++--------- plugins/artwork/albumartorg.c | 34 +++++++++++++++------------ plugins/artwork/albumartorg.h | 34 +++++++++++++++------------ plugins/artwork/artwork.c | 53 +++++++++++++++++++++++++++++++++---------- plugins/artwork/artwork.h | 23 +++++++++++++++++++ plugins/artwork/lastfm.c | 23 +++++++++++++++++++ plugins/artwork/lastfm.h | 33 +++++++++++++++------------ 7 files changed, 161 insertions(+), 65 deletions(-) (limited to 'plugins/artwork') diff --git a/plugins/artwork/COPYING b/plugins/artwork/COPYING index d7e0e673..f88ac121 100644 --- a/plugins/artwork/COPYING +++ b/plugins/artwork/COPYING @@ -1,16 +1,20 @@ DeaDBeeF Album Art plugin Copyright (C) 2009-2014 Viktor Semykin, Alexey Yakovenko et al. -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 software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. -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. +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: -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. +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + +3. This notice may not be removed or altered from any source distribution. diff --git a/plugins/artwork/albumartorg.c b/plugins/artwork/albumartorg.c index 1b21f3f0..c15a17ad 100644 --- a/plugins/artwork/albumartorg.c +++ b/plugins/artwork/albumartorg.c @@ -1,21 +1,27 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + Album Art plugin for DeaDBeeF + Copyright (C) 2009-2011 Viktor Semykin Copyright (C) 2009-2013 Alexey Yakovenko - 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. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. */ + #ifdef HAVE_CONFIG_H # include #endif diff --git a/plugins/artwork/albumartorg.h b/plugins/artwork/albumartorg.h index 46ade53f..dc062541 100644 --- a/plugins/artwork/albumartorg.h +++ b/plugins/artwork/albumartorg.h @@ -1,21 +1,27 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + Album Art plugin for DeaDBeeF + Copyright (C) 2009-2011 Viktor Semykin Copyright (C) 2009-2013 Alexey Yakovenko - 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. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. */ + #ifndef __ALBUMARTORG_H #define __ALBUMARTORG_H diff --git a/plugins/artwork/artwork.c b/plugins/artwork/artwork.c index 44aa68dc..b503a569 100644 --- a/plugins/artwork/artwork.c +++ b/plugins/artwork/artwork.c @@ -1,3 +1,27 @@ +/* + Album Art plugin for DeaDBeeF + Copyright (C) 2009-2011 Viktor Semykin + Copyright (C) 2009-2013 Alexey Yakovenko + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. +*/ + #ifdef HAVE_CONFIG_H # include "../../config.h" #endif @@ -1488,22 +1512,27 @@ static DB_artwork_plugin_t plugin = { .plugin.plugin.name = "Album Artwork", .plugin.plugin.descr = "Loads album artwork either from local directories or from internet", .plugin.plugin.copyright = - "Copyright (C) 2009-2013 Alexey Yakovenko \n" + "Album Art plugin for DeaDBeeF\n" "Copyright (C) 2009-2011 Viktor Semykin \n" + "Copyright (C) 2009-2013 Alexey Yakovenko \n" + "\n" + "This software is provided 'as-is', without any express or implied\n" + "warranty. In no event will the authors be held liable for any damages\n" + "arising from the use of this software.\n" + "\n" + "Permission is granted to anyone to use this software for any purpose,\n" + "including commercial applications, and to alter it and redistribute it\n" + "freely, subject to the following restrictions:\n" "\n" - "This program is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU General Public License\n" - "as published by the Free Software Foundation; either version 2\n" - "of the License, or (at your option) any later version.\n" + "1. The origin of this software must not be misrepresented; you must not\n" + " claim that you wrote the original software. If you use this software\n" + " in a product, an acknowledgment in the product documentation would be\n" + " appreciated but is not required.\n" "\n" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n" + "2. Altered source versions must be plainly marked as such, and must not be\n" + " misrepresented as being the original software.\n" "\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program; if not, write to the Free Software\n" - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" + "3. This notice may not be removed or altered from any source distribution.\n" , .plugin.plugin.website = "http://deadbeef.sf.net", .plugin.plugin.start = artwork_plugin_start, diff --git a/plugins/artwork/artwork.h b/plugins/artwork/artwork.h index 9d8a2a7d..87f04269 100644 --- a/plugins/artwork/artwork.h +++ b/plugins/artwork/artwork.h @@ -1,3 +1,26 @@ +/* + Album Art plugin for DeaDBeeF + Copyright (C) 2009-2011 Viktor Semykin + Copyright (C) 2009-2013 Alexey Yakovenko + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. +*/ #ifndef __ARTWORK_H #define __ARTWORK_H diff --git a/plugins/artwork/lastfm.c b/plugins/artwork/lastfm.c index 5b5cedd4..63483406 100644 --- a/plugins/artwork/lastfm.c +++ b/plugins/artwork/lastfm.c @@ -1,3 +1,26 @@ +/* + Album Art plugin for DeaDBeeF + Copyright (C) 2009-2011 Viktor Semykin + Copyright (C) 2009-2013 Alexey Yakovenko + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. +*/ #ifdef HAVE_CONFIG_H # include #endif diff --git a/plugins/artwork/lastfm.h b/plugins/artwork/lastfm.h index b11ca370..e6fc82ba 100644 --- a/plugins/artwork/lastfm.h +++ b/plugins/artwork/lastfm.h @@ -1,20 +1,25 @@ /* - DeaDBeeF - ultimate music player for GNU/Linux systems with X11 + Album Art plugin for DeaDBeeF + Copyright (C) 2009-2011 Viktor Semykin Copyright (C) 2009-2013 Alexey Yakovenko - 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. + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. */ #ifndef __LASTFM_H #define __LASTFM_H -- cgit v1.2.3