Author: dmeyer
Date: Fri Sep 22 11:38:37 2006
New Revision: 1895
Modified:
trunk/popcorn/setup.py
trunk/popcorn/src/__init__.py
trunk/popcorn/src/backends/__init__.py
trunk/popcorn/src/backends/base.py
trunk/popcorn/src/backends/gstreamer/__init__.py
trunk/popcorn/src/backends/gstreamer/child.py
trunk/popcorn/src/backends/gstreamer/player.py
trunk/popcorn/src/backends/manager.py
trunk/popcorn/src/backends/mplayer/__init__.py
trunk/popcorn/src/backends/mplayer/player.py
trunk/popcorn/src/backends/xine/__init__.py
trunk/popcorn/src/backends/xine/child.py
trunk/popcorn/src/backends/xine/player.py
trunk/popcorn/src/generic.py
trunk/popcorn/src/ptypes.py
trunk/popcorn/src/utils/__init__.py
trunk/popcorn/src/utils/ipc.py
trunk/popcorn/src/utils/mrl.py
trunk/popcorn/test/bad_file.py
trunk/popcorn/test/baloo.py
trunk/popcorn/test/play.py
trunk/popcorn/test/test_backends.py
Log:
s/kaa.player/kaa.popcorn/
Modified: trunk/popcorn/setup.py
==============================================================================
--- trunk/popcorn/setup.py (original)
+++ trunk/popcorn/setup.py Fri Sep 22 11:38:37 2006
@@ -1,15 +1,14 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# setup.py - Setup script for kaa.player
+# setup.py - Setup script for kaa.popcorn
# -----------------------------------------------------------------------------
# $Id$
#
# -----------------------------------------------------------------------------
-# kaa-player - Wrapper for media players include Xine and MPlayer
-# Copyright (C) 2004-2005 Jason Tackaberry <[EMAIL PROTECTED]>
+# kaa.popcorn - Generic Player API
+# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
-# First Edition: Jason Tackaberry <[EMAIL PROTECTED]>
-# Maintainer: Jason Tackaberry <[EMAIL PROTECTED]>
+# Please see the file AUTHORS for a complete list of authors.
#
# 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
@@ -38,11 +37,11 @@
sys.exit(1)
ext_modules = []
-libvisual = Extension("kaa.player._libvisual", ['src/extensions/libvisual.c'])
+libvisual = Extension("kaa.popcorn._libvisual", ['src/extensions/libvisual.c'])
if libvisual.check_library("libvisual", "0.2.0"):
print "+ libvisual support enabled"
ext_modules.append(libvisual)
else:
print "- libvisual support disabled"
-setup(module = 'player', version = '0.1', ext_modules = ext_modules)
+setup(module = 'popcorn', version = '0.1', ext_modules = ext_modules)
Modified: trunk/popcorn/src/__init__.py
==============================================================================
--- trunk/popcorn/src/__init__.py (original)
+++ trunk/popcorn/src/__init__.py Fri Sep 22 11:38:37 2006
@@ -5,7 +5,7 @@
# $Id$
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
Modified: trunk/popcorn/src/backends/__init__.py
==============================================================================
--- trunk/popcorn/src/backends/__init__.py (original)
+++ trunk/popcorn/src/backends/__init__.py Fri Sep 22 11:38:37 2006
@@ -5,7 +5,7 @@
# $Id$
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
Modified: trunk/popcorn/src/backends/base.py
==============================================================================
--- trunk/popcorn/src/backends/base.py (original)
+++ trunk/popcorn/src/backends/base.py Fri Sep 22 11:38:37 2006
@@ -5,7 +5,7 @@
# $Id$
#
# -----------------------------------------------------------------------------
-# Kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
@@ -32,9 +32,9 @@
# kaa imports
import kaa.notifier
-# kaa.player imports
-from kaa.player.ptypes import *
-from kaa.player.utils import parse_mrl
+# kaa.popcorn imports
+from kaa.popcorn.ptypes import *
+from kaa.popcorn.utils import parse_mrl
class PlayerError(Exception):
pass
Modified: trunk/popcorn/src/backends/gstreamer/__init__.py
==============================================================================
--- trunk/popcorn/src/backends/gstreamer/__init__.py (original)
+++ trunk/popcorn/src/backends/gstreamer/__init__.py Fri Sep 22 11:38:37 2006
@@ -1,6 +1,6 @@
from player import GStreamer
-from kaa.player.backends import register
-from kaa.player.ptypes import *
+from kaa.popcorn.backends import register
+from kaa.popcorn.ptypes import *
def get_capabilities():
caps = (CAP_VIDEO, CAP_AUDIO, CAP_OSD, CAP_CANVAS, CAP_DVD, CAP_DVD_MENUS,
Modified: trunk/popcorn/src/backends/gstreamer/child.py
==============================================================================
--- trunk/popcorn/src/backends/gstreamer/child.py (original)
+++ trunk/popcorn/src/backends/gstreamer/child.py Fri Sep 22 11:38:37 2006
@@ -9,8 +9,8 @@
import kaa.notifier
kaa.notifier.init('gtk', x11=False)
-from kaa.player.utils import Player
-from kaa.player.ptypes import *
+from kaa.popcorn.utils import Player
+from kaa.popcorn.ptypes import *
from gst_types import Status
Modified: trunk/popcorn/src/backends/gstreamer/player.py
==============================================================================
--- trunk/popcorn/src/backends/gstreamer/player.py (original)
+++ trunk/popcorn/src/backends/gstreamer/player.py Fri Sep 22 11:38:37 2006
@@ -3,9 +3,9 @@
import kaa.notifier
-from kaa.player.backends.base import MediaPlayer
-from kaa.player.ptypes import *
-from kaa.player.utils import ChildProcess
+from kaa.popcorn.backends.base import MediaPlayer
+from kaa.popcorn.ptypes import *
+from kaa.popcorn.utils import ChildProcess
from gst_types import Status
Modified: trunk/popcorn/src/backends/manager.py
==============================================================================
--- trunk/popcorn/src/backends/manager.py (original)
+++ trunk/popcorn/src/backends/manager.py Fri Sep 22 11:38:37 2006
@@ -5,7 +5,7 @@
# $Id$
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
@@ -31,10 +31,10 @@
# python imports
import os
-# kaa.player imports
-from kaa.player.backends.base import MediaPlayer
-from kaa.player.ptypes import *
-from kaa.player.utils import parse_mrl
+# kaa.popcorn imports
+from kaa.popcorn.backends.base import MediaPlayer
+from kaa.popcorn.ptypes import *
+from kaa.popcorn.utils import parse_mrl
# internal list of players
_players = {}
Modified: trunk/popcorn/src/backends/mplayer/__init__.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/__init__.py (original)
+++ trunk/popcorn/src/backends/mplayer/__init__.py Fri Sep 22 11:38:37 2006
@@ -1,8 +1,8 @@
import kaa.utils
from player import MPlayer, _get_mplayer_info
-from kaa.player.backends import register
-from kaa.player.ptypes import *
+from kaa.popcorn.backends import register
+from kaa.popcorn.ptypes import *
def get_capabilities():
capabilities = [CAP_VIDEO, CAP_AUDIO, CAP_DVD, CAP_VARIABLE_SPEED]
Modified: trunk/popcorn/src/backends/mplayer/player.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/player.py (original)
+++ trunk/popcorn/src/backends/mplayer/player.py Fri Sep 22 11:38:37 2006
@@ -2,9 +2,9 @@
from kaa import notifier, display, shm
import kaa
import kaa.utils
-from kaa.player.backends.base import MediaPlayer
-from kaa.player.ptypes import *
-from kaa.player.utils import parse_mrl
+from kaa.popcorn.backends.base import MediaPlayer
+from kaa.popcorn.ptypes import *
+from kaa.popcorn.utils import parse_mrl
# 0 = none, 1 = interesting lines, 2 = everything, 3 = everything + status,
# 4 = everything + status + run through gdb
Modified: trunk/popcorn/src/backends/xine/__init__.py
==============================================================================
--- trunk/popcorn/src/backends/xine/__init__.py (original)
+++ trunk/popcorn/src/backends/xine/__init__.py Fri Sep 22 11:38:37 2006
@@ -1,6 +1,6 @@
from player import Xine
-from kaa.player.backends import register
-from kaa.player.ptypes import *
+from kaa.popcorn.backends import register
+from kaa.popcorn.ptypes import *
def get_capabilities():
caps = (CAP_VIDEO, CAP_AUDIO, CAP_OSD, CAP_CANVAS, CAP_DVD, CAP_DVD_MENUS,
Modified: trunk/popcorn/src/backends/xine/child.py
==============================================================================
--- trunk/popcorn/src/backends/xine/child.py (original)
+++ trunk/popcorn/src/backends/xine/child.py Fri Sep 22 11:38:37 2006
@@ -9,8 +9,8 @@
from kaa.config import Group, Var
-from kaa.player.utils import Player
-from kaa.player.ptypes import *
+from kaa.popcorn.utils import Player
+from kaa.popcorn.ptypes import *
# Config group for xine player
config = Group(desc = 'Options for xine player', schema = [
Modified: trunk/popcorn/src/backends/xine/player.py
==============================================================================
--- trunk/popcorn/src/backends/xine/player.py (original)
+++ trunk/popcorn/src/backends/xine/player.py Fri Sep 22 11:38:37 2006
@@ -8,9 +8,9 @@
import kaa.shm
import kaa.xine as xine
-from kaa.player.backends.base import MediaPlayer
-from kaa.player.ptypes import *
-from kaa.player.utils import ChildProcess, parse_mrl
+from kaa.popcorn.backends.base import MediaPlayer
+from kaa.popcorn.ptypes import *
+from kaa.popcorn.utils import ChildProcess, parse_mrl
BUFFER_UNLOCKED = 0x10
BUFFER_LOCKED = 0x20
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Fri Sep 22 11:38:37 2006
@@ -8,7 +8,7 @@
# use a player from backends for the real playback.
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
@@ -37,7 +37,7 @@
# kaa imports
import kaa.notifier
-# kaa.player imports
+# kaa.popcorn imports
from ptypes import *
from backends.manager import get_player_class, get_all_players
Modified: trunk/popcorn/src/ptypes.py
==============================================================================
--- trunk/popcorn/src/ptypes.py (original)
+++ trunk/popcorn/src/ptypes.py Fri Sep 22 11:38:37 2006
@@ -1,11 +1,11 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# ptypes.py - Types and constants used by kaa.player
+# ptypes.py - Types and constants used by kaa.popcorn
# -----------------------------------------------------------------------------
# $Id$
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
Modified: trunk/popcorn/src/utils/__init__.py
==============================================================================
--- trunk/popcorn/src/utils/__init__.py (original)
+++ trunk/popcorn/src/utils/__init__.py Fri Sep 22 11:38:37 2006
@@ -5,7 +5,7 @@
# $Id$
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
Modified: trunk/popcorn/src/utils/ipc.py
==============================================================================
--- trunk/popcorn/src/utils/ipc.py (original)
+++ trunk/popcorn/src/utils/ipc.py Fri Sep 22 11:38:37 2006
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------------
-# ipc.py - IPC for kaa.player and childs
+# ipc.py - IPC for kaa.popcorn and childs
# -----------------------------------------------------------------------------
# $Id$
#
@@ -8,7 +8,7 @@
# process and a forked python based proces much easier.
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
Modified: trunk/popcorn/src/utils/mrl.py
==============================================================================
--- trunk/popcorn/src/utils/mrl.py (original)
+++ trunk/popcorn/src/utils/mrl.py Fri Sep 22 11:38:37 2006
@@ -5,7 +5,7 @@
# $Id$
#
# -----------------------------------------------------------------------------
-# kaa-player - Generic Player API
+# kaa.popcorn - Generic Player API
# Copyright (C) 2006 Jason Tackaberry, Dirk Meyer
#
# Please see the file AUTHORS for a complete list of authors.
Modified: trunk/popcorn/test/bad_file.py
==============================================================================
--- trunk/popcorn/test/bad_file.py (original)
+++ trunk/popcorn/test/bad_file.py Fri Sep 22 11:38:37 2006
@@ -2,14 +2,14 @@
import kaa
import kaa.display
-import kaa.player
+import kaa.popcorn
def print_msg(msg):
print '>', msg
-window = kaa.display.X11Window(size = (800,600), title = "kaa.player")
+window = kaa.display.X11Window(size = (800,600), title = "kaa.popcorn")
-player = kaa.player.Player(window)
+player = kaa.popcorn.Player(window)
player.signals["start"].connect_once(window.show)
player.signals["start"].connect(print_msg, 'playback started')
player.signals["end"].connect(print_msg, 'playback end')
Modified: trunk/popcorn/test/baloo.py
==============================================================================
--- trunk/popcorn/test/baloo.py (original)
+++ trunk/popcorn/test/baloo.py Fri Sep 22 11:38:37 2006
@@ -16,7 +16,7 @@
import kaa
import kaa.notifier
import kaa.beacon
-import kaa.player
+import kaa.popcorn
class Baloo(object):
def __init__(self):
@@ -32,7 +32,7 @@
self.timer = kaa.notifier.Timer(self.update_timer)
self.search = []
self.current = None
- self.player = kaa.player.Player()
+ self.player = kaa.popcorn.Player()
self.player.signals['end'].connect_weak(self.play_next)
self.player.signals['pause'].connect_weak(self.player_pause)
self.player.signals['play'].connect_weak(self.player_play)
Modified: trunk/popcorn/test/play.py
==============================================================================
--- trunk/popcorn/test/play.py (original)
+++ trunk/popcorn/test/play.py Fri Sep 22 11:38:37 2006
@@ -3,7 +3,7 @@
import kaa
import kaa.display
-import kaa.player
+import kaa.popcorn
import kaa.input.stdin
logging.getLogger('player').setLevel(logging.INFO)
@@ -28,9 +28,9 @@
win = player.get_window()
win.set_fullscreen(not win.get_fullscreen())
-window = kaa.display.X11Window(size = (800,600), title = "kaa.player")
+window = kaa.display.X11Window(size = (800,600), title = "kaa.popcorn")
-player = kaa.player.Player(window)
+player = kaa.popcorn.Player(window)
player.signals["start"].connect_once(window.show)
player.signals["start"].connect(print_msg, 'playback started')
player.signals["end"].connect(print_msg, 'playback end')
Modified: trunk/popcorn/test/test_backends.py
==============================================================================
--- trunk/popcorn/test/test_backends.py (original)
+++ trunk/popcorn/test/test_backends.py Fri Sep 22 11:38:37 2006
@@ -3,7 +3,7 @@
import kaa
import kaa.display
-import kaa.player
+import kaa.popcorn
logging.getLogger('player.child').setLevel(logging.INFO)
@@ -15,9 +15,9 @@
player.open(sys.argv[1], player=id)
player.play()
-window = kaa.display.X11Window(size = (800,600), title = "kaa.player")
+window = kaa.display.X11Window(size = (800,600), title = "kaa.popcorn")
-player = kaa.player.Player(window)
+player = kaa.popcorn.Player(window)
player.signals["start"].connect_once(window.show)
player.signals["start"].connect(print_msg, 'playback started')
player.signals["end"].connect(print_msg, 'playback end')
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
