Skip to content

Commit

Permalink
multicontext branch: Merge from trunk.
Browse files Browse the repository at this point in the history
svn path=/branches/experiments/libavg_multicontext/; revision=9520
  • Loading branch information
uzadow committed Jan 22, 2014
1 parent 257376d commit 7b0fc03
Show file tree
Hide file tree
Showing 583 changed files with 609 additions and 598 deletions.
2 changes: 1 addition & 1 deletion CreateVersionFile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# libavg - Media Playback Engine.
# Copyright (C) 2003-2012 Ulrich von Zadow
# Copyright (C) 2003-2014 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
Expand Down
12 changes: 8 additions & 4 deletions fixcopyright.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@ def handleFile(path):
# m = re.match(r'#include\s*["<]([\-_a-zA-Z0-9\.\\/]+)[">]\s*', l)
if match:
if path[-2:] == 'py':
lines[i] = "# Copyright (C) 2003-2011 Ulrich von Zadow\n"
lines[i] = "# Copyright (C) 2003-2014 Ulrich von Zadow\n"
else:
lines[i] = "// Copyright (C) 2003-2011 Ulrich von Zadow\n"
lines[i] = "// Copyright (C) 2003-2014 Ulrich von Zadow\n"
found = True
if not(found):
if found:
outFile = open(path, "w")
for line in lines:
outFile.write(line)
else:
print path


for ext in ("h", "c", "cpp", "py"):
cmd = 'find . -name "*.'+ext+'"'
Expand Down
2 changes: 1 addition & 1 deletion src/anim/Anim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/Anim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/AttrAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/AttrAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/ContinuousAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/ContinuousAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/EaseInOutAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/EaseInOutAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/LinearAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/LinearAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/ParallelAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/ParallelAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/SimpleAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/SimpleAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/StateAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/StateAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/WaitAnim.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/anim/WaitAnim.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/api.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioBuffer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioBuffer.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioEngine.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioEngine.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
5 changes: 4 additions & 1 deletion src/audio/AudioMsg.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down Expand Up @@ -144,6 +144,9 @@ void AudioMsg::dump()
case PACKET:
cerr << "PACKET" << endl;
break;
case CLOSED:
cerr << "CLOSED" << endl;
break;
default:
AVG_ASSERT(false);
break;
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioMsg.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioParams.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioParams.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioSource.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/AudioSource.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/Dynamics.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/IProcessor.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/audio/testlimiter.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/avgconfigwrapper.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/Backtrace.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/Backtrace.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/BezierCurve.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/BezierCurve.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/CmdQueue.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/Command.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/ConfigMgr.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/ConfigMgr.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/CubicSpline.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/CubicSpline.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
2 changes: 1 addition & 1 deletion src/base/DAG.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// libavg - Media Playback Engine.
// Copyright (C) 2003-2011 Ulrich von Zadow
// Copyright (C) 2003-2014 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
Expand Down
Loading

0 comments on commit 7b0fc03

Please sign in to comment.