Merge branch 'master' into features/python3

CreateVersionFile.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
-#
 
 # The script generates a header file that contains versioning data for
 # the current build.

fixcopyright.py

@@ -1,32 +1,67 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# libavg - Media Playback Engine.
+# Copyright (C) 2011-2020 Ulrich von Zadow
+#
+# This library 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 library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# Current versions can be found at www.libavg.de
 
 import os
 import re
+import time
+
+TEMPLATE = 'Copyright (C) %s-%s Ulrich von Zadow\n'
+
+num_changed = 0
+num_skipped = 0
+
 
 def handleFile(path):
+    global num_changed, num_skipped
+
     lines = file(path).readlines()
-    lineNumber = 0
     found = False
     for i, line in enumerate(lines):
-        match = re.match(r'((//)|(#))\s*Copyright \(C\) 2003-(.*) Ulrich von Zadow\s*', line)
-#        m = re.match(r'#include\s*["<]([\-_a-zA-Z0-9\.\\/]+)[">]\s*', l)
+        match = re.match(r'((//)|(#))\s*Copyright \(C\) (?P<from>\d{4})(.*) Ulrich von Zadow\s*', line)
         if match:
+            year_from = match.group('from')
+            year_to = str(time.localtime().tm_year)
             if path[-2:] == 'py':
-                lines[i] = "# Copyright (C) 2003-2014 Ulrich von Zadow\n"
+                lines[i] = '# ' + TEMPLATE % (year_from, year_to)
             else:
-                lines[i] = "//  Copyright (C) 2003-2014 Ulrich von Zadow\n"
+                lines[i] = '//  ' + TEMPLATE % (year_from, year_to)
             found = True
+            break
     if found:
+        num_changed +=1
         outFile = open(path, "w")
         for line in lines:
             outFile.write(line)
     else:
-        print path
-
+        num_skipped +=1
+        print 'skipping', path
+
 
+# TODO: include src/graphics/shaders/*, python/scripts/*
 for ext in ("h", "c", "cpp", "py"):
-    cmd = 'find . -name "*.'+ext+'"'
+    cmd = 'find . -name "*.'+ext+'" -not -wholename "'+__file__+'"'
     files = os.popen(cmd).readlines()
     for f in files:
         handleFile(f.strip())
 
+print 'changed:', num_changed
+print 'skipped:', num_skipped

python/libavg/__init__.py

@@ -1,5 +1,24 @@
-# libavg is a high-level development platform for media-centric applications.
-# https://www.libavg.de
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# libavg - Media Playback Engine.
+# Copyright (C) 2003-2020 Ulrich von Zadow
+#
+# This library 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 library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# Current versions can be found at www.libavg.de
 
 # Work around libstdc++ Mesa bug
 # (https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/259219)
@@ -13,8 +32,6 @@
 from .avg import *
 player = avg.Player.get()
 
-from .enumcompat import *
-
 from . import textarea
 from . import statemachine
 from . import utils, methodref

python/libavg/app/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

python/libavg/app/app.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

python/libavg/app/debugpanel.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -374,7 +374,7 @@ def update(self):
             else:
                 key = keystring
 
-            if binding.type == libavg.avg.KEYDOWN:
+            if binding.type == libavg.avg.Event.KEY_DOWN:
                 key = '%s %s' % (chr(8595), key)
             else:
                 key = '%s %s' % (chr(8593), key)

python/libavg/app/flashmessage.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

python/libavg/app/keyboardmanager.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -60,17 +60,17 @@ def init():
 
 def bindKeyDown(scancode=None, keyname=None, text=None, handler=None, help=None,
         modifiers=avg.KEYMOD_NONE):
-    _bindKey(scancode, keyname, text, handler, help, modifiers, avg.KEYDOWN)
+    _bindKey(scancode, keyname, text, handler, help, modifiers, avg.Event.KEY_DOWN)
 
 def bindKeyUp(scancode=None, keyname=None, handler=None, help=None,
         modifiers=avg.KEYMOD_NONE):
-    _bindKey(scancode, keyname, None, handler, help, modifiers, avg.KEYUP)
+    _bindKey(scancode, keyname, None, handler, help, modifiers, avg.Event.KEY_UP)
 
 def unbindKeyDown(scancode=None, keyname=None, text=None, modifiers=avg.KEYMOD_NONE):
-    _unbindKey(scancode, keyname, text, modifiers, avg.KEYDOWN)
+    _unbindKey(scancode, keyname, text, modifiers, avg.Event.KEY_DOWN)
 
 def unbindKeyUp(scancode=None, keyname=None, modifiers=avg.KEYMOD_NONE):
-    _unbindKey(scancode, keyname, None, modifiers, avg.KEYUP)
+    _unbindKey(scancode, keyname, None, modifiers, avg.Event.KEY_UP)
 
 def unbindAll():
     global _keyBindings, _keyBindingsStack

python/libavg/app/settings.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

python/libavg/app/touchvisualization.py

@@ -1,5 +1,8 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
-#
 
 import os
 

python/libavg/apphelpers.py

@@ -1,5 +1,8 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
-#
 
 import os
 

python/libavg/filter.py

@@ -1,6 +1,8 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
-#
 
 import math
 

python/libavg/geom.py

@@ -1,5 +1,8 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
-#
 
 from libavg import avg
 

python/libavg/gesture.py

@@ -1,6 +1,8 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
-#
 
 from libavg import avg, statemachine, player, filter
 

python/libavg/graph.py

@@ -1,5 +1,8 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

python/libavg/methodref.py

@@ -1,5 +1,8 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

python/libavg/mtemu.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
+#
 # Original author of this file is Sebastian Maulbeck
 # <sm (at) archimedes-solutions (dot) de>
 

python/libavg/parsecamargs.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
+
 # libavg - Media Playback Engine.
-# Copyright (C) 2003-2014 Ulrich von Zadow
+# Copyright (C) 2003-2020 Ulrich von Zadow
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Current versions can be found at www.libavg.de
-#
 
 from libavg import avg