Changeset 522

Timestamp:

12/17/06 22:00:28 (2 years ago)

Author:

nicfit

Message:

CD audio playback

Files:

• trunk/Makefile.in (modified) (3 diffs)
• trunk/etc/mesk-0.3.0.ebuild (modified) (1 diff)
• trunk/src/audio_control.py (modified) (5 diffs)
• trunk/src/cdrom_control.py (modified) (3 diffs)
• trunk/src/devices.py (modified) (1 diff)
• trunk/src/mesk/audio/cdaudio.py (modified) (1 diff)
• trunk/src/mesk/uri.py (modified) (1 diff)
• trunk/src/playlist_control.py (modified) (4 diffs)

trunk/Makefile.in

@@ -35 +35 @@
-
-.PHONY: all install uninstall clean distclean maintainer-clean dist changelog \
-
-
+
-
-all: module etc/mesk.desktop README
@@ -47 +46 @@
-                       ./po etc/mesk.desktop.in etc/mesk.desktop
-
-
+
+
+
+
-        ${PYTHON} setup.py install --prefix=${prefix}
-
@@ -77 +79 @@
-        install -m 755 -d ${mandir}
-        install -m 755 -d ${mandir}/man1
-cat etc/mesk.1 | gzip - > etc/mesk.1.gz
-install -m 644 etc/mesk.1.gz ${mandir}/man
+install -m 644 etc/mesk.1 ${mandir}/man1
+gzip -f -9 ${mandir}/man1/mesk.
-
-        # Desktop file

trunk/etc/mesk-0.3.0.ebuild

@@ -25 +25 @@
-        =>sys-apps/eject-2.1.5
-        =dev-python/cddb-py-1.4*
+        =media-plugins/gst-plugins-cdio-0.10*
-        mad? (=media-plugins/gst-plugins-mad-0.10*
-                >=dev-python/eyeD3-0.6.10)

trunk/src/audio_control.py

@@ -369 +369 @@
-            args = keywords
-
+        mesk.log.debug('AudioControl.enqueue_source: %s' % str(args))
-        def arg_value(key):
-            try:
@@ -417 +418 @@
-                self._set_source(src)
-            except Exception, ex:
+                mesk.log.error('enqueue_source error: %s' % str(ex))
-                self.emit('error', ex, src)
-                return
@@ -429 +431 @@
-
-    def _set_source(self, src):
+        mesk.log.debug("AudioControl._set_source %s %s" % (str(src),
+                                                           str(src.uri)))
-        if src and src.uri.scheme.startswith('http'):
-            base_uri = os.path.dirname(str(src.uri))
@@ -506 +510 @@
-            msg = 'Unable to locate a valid Gstreamer sync'
-            mesk.log.error(msg)
-
+mesk.Mesk
-
-        if self._gst_bin:
+            # Cleanup existing bin
-            self._gst_bin.set_state(gst.STATE_NULL)
-            del self._gst_bin
@@ -520 +525 @@
-        bus.connect('message', self._on_gst_message)
-
+        self._gst_bin.connect('notify::source', self._on_gst_source_notify)
-        self._gst_bin.set_state(gst.STATE_READY)
+
+    def _on_gst_source_notify(self, bin, pspec):
+        from mesk.audio.cdaudio import CDAudioSource
+        src_elem = bin.get_property('source')
+        # If the source is CD audio, make sure to select the proper device
+        if (src_elem and ('device' in dir(src_elem.props)) and
+                isinstance(self._current_audio_src, CDAudioSource)):
+            src_elem.set_property('device',
+                                  self._current_audio_src.block_device)
-
-    ### Gstreamer Sink Creation ###

trunk/src/cdrom_control.py

@@ -40 +40 @@
-        self.device = self.device_manager.get_optical_devices()[self.hal_udi]
-        self.block_device = self.device.GetProperty('block.device')
+        display_name = self.device_manager.get_device_display_name(self.device)
+        self.name = display_name
-
-        # Check capabilities
@@ -49 +51 @@
-        # Setup tab label
-        tab_label = self.tab_label_xml.get_widget('playlist_tab_label')
-        display_name = self.device_manager.get_device_display_name(self.device)
-        tab_label.set_text(display_name)
-        tab_label_img = self.tab_label_xml.get_widget('playlist_tab_image')
@@ -147 +148 @@
-            metadata.time_secs = length
-            metadata.track_num = i + 1
-
+
+
-
-            minus = disc_info[i + 3] / 75

trunk/src/devices.py

@@ -72 +72 @@
-
-        dev_file = os.path.basename(device.GetProperty('block.device'))
- 
+
-
-    def get_device_monitor(self):

trunk/src/mesk/audio/cdaudio.py

@@ -27 +27 @@
-
-class CDAudioSource(AudioSource):
-
+device, 
-        # gnomevfs does not like cdda:// uris, workaround
-        AudioSource.__init__(self, "file://dummy", meta_data)
-        self.uri = mesk.uri.CddaURI(track_num)
-
+        self.block_device = device
-        if not meta_data:
-            self.meta_data = AudioMetaData()

trunk/src/mesk/uri.py

@@ -23 +23 @@
-
-class CddaURI(object):
+    '''This is here because gnomevfs.URI is not extensible and does not like
+    cdda:// schemes.'''
-    def __init__(self, track_num):
-
+
+
+
+
+
-
-def is_uri(uri):

trunk/src/playlist_control.py

@@ -88 +88 @@
-        self.tab_widget.connect('button-press-event',
-                                self._on_playlist_tab_ebox_button_press_event)
-        self.tab_widget.connect('key-press-event',
-                                self._on_playlist_tab_key_press_event)
-        self.tab_label_label = \
-            self.tab_label_xml.get_widget('playlist_tab_label')
@@ -186 +184 @@
-        append_text_column(_('Time'), MODEL_TIME, expand = False)
-
-        # Load playlist
-        if mesk.log.getLogger().isEnabledFor(mesk.log.DEBUG):
-            # Debugging load time
-            import time
-            t1 = time.time()
+        # Load playlist
-        pl = mesk.playlist.load(self._pl_config.uri, name=self._pl_config.name)
-        # FIXME: Is this what's fucking up the restart position?
-        pl.set_curr_index(-1)
-        if mesk.log.getLogger().isEnabledFor(mesk.log.DEBUG):
-            # Debugging load time
@@ -291 +287 @@
-               ]
-
- = True, audio_ctrl = 
+=True, audio_ctrl=
-
-        if not active:
@@ -794 +790 @@
-            except ValueError:
-                mesk.log.warn("Invalid queue index: %d" % old)
-
-    def _on_playlist_tab_key_press_event(self, widget, event):
-        # XXX: I don't see this getting called
-        sys.stderr.write("_on_playlist_tab_key_press_even called!!\n")
-        return self._on_playlist_control_key_press_event(widget, event)
-
-    def _on_playlist_view_key_press_event(self, widget, event):