From 3065fd47a0564e12b96cddf8d011befffe2294b6 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 13 Dec 2017 14:37:46 -0600 Subject: [PATCH] MediaPlayer: Relicense to MIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * The GPL license here was a relic from the past to help control YellowTab's use of Haiku source code. The intent at the time was to relicense MIT. Some GPL parts remained. * This is going to get harder and harder to correct over time. * This code makes Haiku *not* MIT. Lets correct that. * I reached out to everyone who made changes to these files and got personal approvals to relicense MIT. * If I missed somebody, *and* you feel as though the MIT license doesn't meet your needs, please contact Haiku, Inc. and we will work to revert your changes. Marcus Overhagen EMAIL - MIT OK 11/29/17 Stephan Aßmus EMAIL - MIT OK 11/28/17 Axel Dörfler IRC - MIT OK 11/29/17 Ryan Leavengood KEYBASE - MIT OK 11/28/17 Michael Lotz IRC - MIT OK 11/29/17 Adrien Destugues EMAIL - MIT OK 11/28/17 Joachim Seemer EMAIL - MIT OK 11/28/17 Jonas Sundström EMAIL - MIT OK 11/29/17 François Revol IRC - MIT OK 11/29/17 Jérôme Duval EMAIL - MIT OK 11/29/17 Oliver Tappe EMAIL - MIT OK 11/29/17 Dziadek EMAIL - MIT OK 11/29/17 Philippe Saint-Pierre EMAIL - MIT OK 12/6/17 Philippe Houdoin EMAIL - MIT OK 12/8/17 Dario Casalinuovo IRC - MIT OK 12/13/17 --- src/apps/mediaplayer/Controller.cpp | 18 +++--------------- src/apps/mediaplayer/Controller.h | 14 +------------- src/apps/mediaplayer/ControllerView.cpp | 14 +------------- src/apps/mediaplayer/ControllerView.h | 14 +------------- src/apps/mediaplayer/InfoWin.cpp | 14 +------------- src/apps/mediaplayer/InfoWin.h | 14 +------------- src/apps/mediaplayer/MainApp.cpp | 14 +------------- src/apps/mediaplayer/MainApp.h | 14 +------------- src/apps/mediaplayer/MainWin.cpp | 14 +------------- src/apps/mediaplayer/MainWin.h | 14 +------------- src/apps/mediaplayer/playlist/Playlist.cpp | 14 +------------- src/apps/mediaplayer/playlist/Playlist.h | 14 +------------- 12 files changed, 14 insertions(+), 158 deletions(-) diff --git a/src/apps/mediaplayer/Controller.cpp b/src/apps/mediaplayer/Controller.cpp index 76d839a6c6..2efda09162 100644 --- a/src/apps/mediaplayer/Controller.cpp +++ b/src/apps/mediaplayer/Controller.cpp @@ -2,22 +2,10 @@ * Controller.cpp - Media Player for the Haiku Operating System * * Copyright (C) 2006 Marcus Overhagen - * Copyright (C) 2007-2008 Stephan Aßmus (MIT Ok) - * Copyright (C) 2007-2009 Fredrik Modéen <[FirstName]@[LastName].se> (MIT ok) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. + * Copyright (C) 2007-2008 Stephan Aßmus + * Copyright (C) 2007-2009 Fredrik Modéen <[FirstName]@[LastName].se> * + * Released under the terms of the MIT license. */ diff --git a/src/apps/mediaplayer/Controller.h b/src/apps/mediaplayer/Controller.h index e271cb17a7..45ec5a2232 100644 --- a/src/apps/mediaplayer/Controller.h +++ b/src/apps/mediaplayer/Controller.h @@ -4,19 +4,7 @@ * Copyright (C) 2006 Marcus Overhagen * Copyright (C) 2007-2008 Stephan Aßmus (MIT Ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ #ifndef __CONTROLLER_H #define __CONTROLLER_H diff --git a/src/apps/mediaplayer/ControllerView.cpp b/src/apps/mediaplayer/ControllerView.cpp index 9611df3b6e..07d639c9e7 100644 --- a/src/apps/mediaplayer/ControllerView.cpp +++ b/src/apps/mediaplayer/ControllerView.cpp @@ -5,19 +5,7 @@ * Copyright (C) 2007 Stephan Aßmus * Copyright (C) 2008-2009 Fredrik Modéen <[FirstName]@[LastName].se> (MIT ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ diff --git a/src/apps/mediaplayer/ControllerView.h b/src/apps/mediaplayer/ControllerView.h index 51469e0e15..9919367eff 100644 --- a/src/apps/mediaplayer/ControllerView.h +++ b/src/apps/mediaplayer/ControllerView.h @@ -5,19 +5,7 @@ * Copyright (C) 2007 Stephan Aßmus * Copyright (C) 2008-2009 Fredrik Modéen <[FirstName]@[LastName].se> (MIT ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ #ifndef __CONTROLLER_VIEW_H #define __CONTROLLER_VIEW_H diff --git a/src/apps/mediaplayer/InfoWin.cpp b/src/apps/mediaplayer/InfoWin.cpp index 12f9e64b7d..a14babdd66 100644 --- a/src/apps/mediaplayer/InfoWin.cpp +++ b/src/apps/mediaplayer/InfoWin.cpp @@ -4,19 +4,7 @@ * Copyright (C) 2006 Marcus Overhagen * Copyright 2015 Axel Dörfler * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ diff --git a/src/apps/mediaplayer/InfoWin.h b/src/apps/mediaplayer/InfoWin.h index 1cd72fbd51..61f496d4b4 100644 --- a/src/apps/mediaplayer/InfoWin.h +++ b/src/apps/mediaplayer/InfoWin.h @@ -3,19 +3,7 @@ * * Copyright (C) 2006 Marcus Overhagen * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ #ifndef __FILE_INFO_WIN_H #define __FILE_INFO_WIN_H diff --git a/src/apps/mediaplayer/MainApp.cpp b/src/apps/mediaplayer/MainApp.cpp index af37a1b47c..c454d8b996 100644 --- a/src/apps/mediaplayer/MainApp.cpp +++ b/src/apps/mediaplayer/MainApp.cpp @@ -4,19 +4,7 @@ * Copyright (C) 2006 Marcus Overhagen * Copyright (C) 2008 Stephan Aßmus (MIT Ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ diff --git a/src/apps/mediaplayer/MainApp.h b/src/apps/mediaplayer/MainApp.h index 282b765ab0..cbede30a2c 100644 --- a/src/apps/mediaplayer/MainApp.h +++ b/src/apps/mediaplayer/MainApp.h @@ -4,19 +4,7 @@ * Copyright (C) 2006 Marcus Overhagen * Copyright (C) 2008 Stephan Aßmus * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ #ifndef __MAIN_APP_H #define __MAIN_APP_H diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index b63b1934bb..8fe8605a8b 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -5,19 +5,7 @@ * Copyright (C) 2007-2010 Stephan Aßmus (GPL->MIT ok) * Copyright (C) 2007-2009 Fredrik Modéen <[FirstName]@[LastName].se> (MIT ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. + * Released under the terms of the MIT license. */ diff --git a/src/apps/mediaplayer/MainWin.h b/src/apps/mediaplayer/MainWin.h index c2b2de815f..e41149826e 100644 --- a/src/apps/mediaplayer/MainWin.h +++ b/src/apps/mediaplayer/MainWin.h @@ -4,19 +4,7 @@ * Copyright (C) 2006 Marcus Overhagen * Copyright (C) 2007-2010 Stephan Aßmus (MIT ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ #ifndef __MAIN_WIN_H #define __MAIN_WIN_H diff --git a/src/apps/mediaplayer/playlist/Playlist.cpp b/src/apps/mediaplayer/playlist/Playlist.cpp index dc4714a563..384ff181e3 100644 --- a/src/apps/mediaplayer/playlist/Playlist.cpp +++ b/src/apps/mediaplayer/playlist/Playlist.cpp @@ -5,19 +5,7 @@ * Copyright (C) 2007-2009 Stephan Aßmus (MIT ok) * Copyright (C) 2008-2009 Fredrik Modéen <[FirstName]@[LastName].se> (MIT ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ diff --git a/src/apps/mediaplayer/playlist/Playlist.h b/src/apps/mediaplayer/playlist/Playlist.h index 1fb67e78eb..131fe5636c 100644 --- a/src/apps/mediaplayer/playlist/Playlist.h +++ b/src/apps/mediaplayer/playlist/Playlist.h @@ -5,19 +5,7 @@ * Copyright (C) 2007-2009 Stephan Aßmus (MIT ok) * Copyright (C) 2008-2009 Fredrik Modéen <[FirstName]@[LastName].se> (MIT ok) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * 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. - * + * Released under the terms of the MIT license. */ #ifndef __PLAYLIST_H #define __PLAYLIST_H