Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2007-11-13 00:50:20 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2007-11-13 00:50:20 (GMT)
commit4c66eec49b12daf54163d17134c40f3a356f9737 (patch)
tree337919d9f5ff47404a11f35b5f11b8aa1e044a2c /lib
parent9645b0e6e56248a3ef742c7c9dca55525af31353 (diff)
Completely get rid of sound in the shell to make
sure it's not causing problems.
Diffstat (limited to 'lib')
-rw-r--r--lib/sugar/Makefile.am1
-rw-r--r--lib/sugar/sound.py44
2 files changed, 0 insertions, 45 deletions
diff --git a/lib/sugar/Makefile.am b/lib/sugar/Makefile.am
index 19cf1ea..e9b92f7 100644
--- a/lib/sugar/Makefile.am
+++ b/lib/sugar/Makefile.am
@@ -5,7 +5,6 @@ sugar_PYTHON = \
env.py \
network.py \
profile.py \
- sound.py \
util.py \
wm.py
diff --git a/lib/sugar/sound.py b/lib/sugar/sound.py
deleted file mode 100644
index 2ceaeed..0000000
--- a/lib/sugar/sound.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2007 One Laptop Per Child
-#
-# 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.
-
-import logging
-
-import gst
-
-class Player(object):
- def __init__(self):
- self._player = gst.element_factory_make("playbin", "player")
-
- bus = self._player.get_bus()
- bus.add_signal_watch()
- bus.connect("message::eos", self.__eos_cb)
- bus.connect("message::error", self.__error_cb)
-
- def play(self, sound_path):
- self._player.set_property("uri", "file://" + sound_path)
- self._player.set_state(gst.STATE_PLAYING)
-
- def __eos_cb(self, bus, message):
- self._player.set_state(gst.STATE_NULL)
-
- def __error_cb(self, bus, message):
- logging.error(message.parse_error())
-
-_player = Player()
-
-def play(sound_path):
- _player.play(sound_path)