Changeset 298

Timestamp:

06/10/06 21:08:58 (3 years ago)

Author:

nicfit

Message:

Added the ability to play remote files (http)

Files:

• trunk/src/audio_control.py (modified) (4 diffs)
• trunk/src/mesk/audio_source.py (modified) (7 diffs)
• trunk/src/mesk/playlist.py (modified) (3 diffs)
• trunk/src/mesk/utils.py (modified) (1 diff)
• trunk/src/playlist_control.py (modified) (3 diffs)
• trunk/src/plugins/audioscrobbler.py (modified) (1 diff)

trunk/src/audio_control.py

@@ -94 +94 @@
-        gobject.signal_new('prev', AudioControl, gobject.SIGNAL_RUN_LAST,
-                           gobject.TYPE_NONE, [])
-
-
+
-                           gobject.SIGNAL_RUN_LAST,
-                           gobject.TYPE_NONE,
-                           [gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT])
-
-
+
-                           gobject.TYPE_NONE, [gobject.TYPE_STRING,
-                                               gobject.TYPE_PYOBJECT])
-
+
+
+
+
-                           gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [])
-
@@ -351 +352 @@
-    def _set_source(self, src):
-        self._set_track_scale(0.0)
-
-
-
-
-
+
-        self._current_audio_src = src
-
@@ -428 +425 @@
-                                {'next': True, 'start_playing': True})
-        elif message.type == gst.MESSAGE_TAG:
-
-
+
+
+
-        elif message.type == gst.MESSAGE_ERROR:
-            self._gst_error_set = True
@@ -438 +436 @@
-            self.emit('error', error, self._current_audio_src)
-
+    def _update_meta_data(self, src, taglist):
+        '''Possible keys:
+        ['title', 'artist', 'album', 'date', 'track-count', 'track-number',
+         'genre', 'duration']
+        ['layer', 'mode', 'emphasis', 'audio-codec', 'bitrate']
+        '''
+        changed = False
+        keys = taglist.keys()
+        if 'title' in keys:
+            src.meta_data.title = unicode(taglist['title'], 'utf-8')
+        if 'artist' in keys:
+            src.meta_data.artist = unicode(taglist['artist'], 'utf-8')
+        if 'album' in keys:
+            src.meta_data.album = unicode(taglist['album'], 'utf-8')
+        if 'date' in keys:
+            src.meta_data.year = unicode(str(taglist['date'].year), 'utf-8')
+        if 'track-number' in keys:
+            src.meta_data.track_num = taglist['track-number']
+        if 'track-count' in keys:
+            src.meta_data.track_total = taglist['track-count']
+        if 'duration' in keys:
+            src.audio_info.time_secs = taglist['duration'] / gst.SECOND
+        self.emit('tag-update', src)
-
-    ### Timer methods ###

trunk/src/mesk/audio_source.py

@@ -42 +42 @@
-    year = None
-    track_num = track_total = None
+    frozen = False
-
-    def __init__(self, native_tag = None):
@@ -50 +51 @@
-        self.album = native_tag.getAlbum() or EMPTY_METADATA
-        self.year = native_tag.getYear()
- or 0
+
-
-class AudioSource:
@@ -56 +57 @@
-        if not isinstance(uri, Uri):
-            self.uri = Uri(uri)
+        else:
+            self.uri = uri
-        self.meta_data = None
-        self.audio_info = AudioInfo()
@@ -67 +70 @@
-            self.audio_info.time_secs = audio_file.getPlayTime()
-            self.audio_info.size_bytes = audio_file.getSize()
-
-            self.meta_data = AudioMetaData(audio_file.tag)
-        except eyeD3.TagException, ex:
@@ -75 +77 @@
-
-        if not self.meta_data:
+            self.metadata = AudioMetaData()
-            mesk.log.warning(_('No metadata for file \'%s\'') % self.uri.path)
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-class UnsupportedScheme(Exception):
@@ -96 +104 @@
-    if uri.scheme == 'file':
-        path = os.path.realpath(os.path.abspath(uri.path))
-
-][1
+[1]
+
-            mt = mimetypes.guess_type(path)[0]
-            if not mt:
@@ -107 +115 @@
-            mesk.log.error(_('Error loading source file %s') % path)
-            src = None
+    elif uri.scheme == 'http' or uri.scheme == 'https':
+        # FIXME: Pass any extended m3u info
+        src = HttpAudioSource(uri)
-    else:
-        raise UnsupportedScheme(_('Unsupported audio URI scheme: %s') % \

trunk/src/mesk/playlist.py

@@ -23 +23 @@
-import audio_source
-import utils
+import log
-import common.uri
-
@@ -42 +43 @@
-        line = line.strip()
-        if line[0] == '#':
-TODO
+FIXME
-            continue
-
-
-
+
+
+
+
+
+
+
-    fp.close()
-
@@ -52 +57 @@
-    fp = file(pl_file, 'w')
-    for src in pl:
-
+
+
+
+
-        fp.write('\n')
-    fp.close()

trunk/src/mesk/utils.py

@@ -27 +27 @@
-def format_track_time(curr, total = None):
-    def time_tuple(ts):
+        if ts is None or ts < 0:
+            ts = 0
-        hours = ts / 3600
-        mins = (ts % 3600) / 60

trunk/src/playlist_control.py

@@ -175 +175 @@
-        self._audio_control.connect('error', self._on_audio_error)
-        self._audio_control.connect('playlist-reset', self._on_playlist_reset)
+        self._audio_control.connect('tag-update', self._on_audio_tag_update)
-
-        self.widget.show()
@@ -195 +196 @@
-        self._save_playlist()
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        track_num = src.meta_data.track_num
-        if track_num is None:
-            track_num = 0
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-               ]
-
@@ -369 +386 @@
-        if src_index != len(self._playlist) - 1:
-            gobject.idle_add(self._audio_control.next, True)
+
+    def _on_audio_tag_update(self, audio_control, audio_src):
+        row = self._playlist.index(audio_src)
+        model_iter = self._pl_model.get_iter(row)
+
+        model_data = self._get_model_metadata(audio_src)
+        for key in model_data:
+            self._pl_model.set_value(model_iter, key, model_data[key])
-
-    def _on_dialog_close(self, dialog, response):

trunk/src/plugins/audioscrobbler.py

@@ -395 +395 @@
-            src_len = audio_src.audio_info.time_secs
-            if src_len < 30:
-
+
+
-                return
-            interval = min(src_len / 2, 240)