From 6b3ac7162164f45b68d7da8d97d7f53f1cb12a59 Mon Sep 17 00:00:00 2001 From: Nicolas Duhamel Date: Sat, 9 Apr 2011 20:35:03 +0200 Subject: [PATCH] mediaplayer fix license --- weboob/tools/application/media_player.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/weboob/tools/application/media_player.py b/weboob/tools/application/media_player.py index 3cbcda88..e415d03a 100644 --- a/weboob/tools/application/media_player.py +++ b/weboob/tools/application/media_player.py @@ -1,19 +1,21 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2010 Christophe Benz, Romain Bignon, John Obbele +# Copyright(C) 2010-2011 Christophe Benz, Romain Bignon, John Obbele # -# 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, version 3 of the License. +# This file is part of weboob. # -# This program is distributed in the hope that it will be useful, +# weboob is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# weboob 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. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU Affero General Public License +# along with weboob. If not, see . import os @@ -26,9 +28,9 @@ __all__ = ['InvalidMediaPlayer', 'MediaPlayer', 'MediaPlayerNotFound'] PLAYERS = ( - ('mplayer', '-'), ('parole', 'fd://0'), ('totem', 'fd://0'), + ('mplayer', '-'), ('vlc', '-'), ('xine', 'stdin:/'), )