Changeset 313

Timestamp:

06/17/06 19:20:26 (2 years ago)

Author:

nicfit

Message:

Refactor of audio_source module to mesk.audio.*, Ogg vorbis support, and misc goodness

Files:

• trunk (modified) (1 prop)
• trunk/Makefile.in (modified) (1 diff)
• trunk/po/POTFILES.in (modified) (2 diffs)
• trunk/po/es.po (modified) (9 diffs)
• trunk/po/mesk.pot (modified) (8 diffs)
• trunk/setup.py.in (modified) (1 diff)
• trunk/src/about_dialog.py (modified) (2 diffs)
• trunk/src/audio_control.py (modified) (3 diffs)
• trunk/src/images/mesk_felon.png (added)
• trunk/src/mesk/__init__.py (modified) (2 diffs)
• trunk/src/mesk/audio (added)
• trunk/src/mesk/audio/__init__.py (added)
• trunk/src/mesk/audio/mp3.py (added)
• trunk/src/mesk/audio/oggvorbis.py (added)
• trunk/src/mesk/audio/source.py (added)
• trunk/src/mesk/audio_source.py (deleted)
• trunk/src/mesk/playlist.py (modified) (2 diffs)
• trunk/src/mesk_gui.glade (modified) (1 diff)
• trunk/src/playlist_control.py (modified) (10 diffs)
• trunk/src/plugins/audioscrobbler.py (modified) (2 diffs)

trunk/Makefile.in

@@ -143 +143 @@
-        -rm -f configure
-        -rm etc/mesk.1
-        -rm tags
-        -rm ./etc/mesk.desktop
-

trunk/po/POTFILES.in

@@ -11 +11 @@
-src/main.py
-src/main_window.py
-
+
+
+
+
-src/mesk/common/config.py
-src/mesk/common/i18n.py
@@ -23 +26 @@
-src/mesk/plugin/listeners.py
-src/mesk/utils.py
+src/mmkeys/setup.py
+src/multi_media_keys.py
-src/playlist_control.py
-src/plugins/audioscrobbler.py

trunk/po/es.po

@@ -8 +8 @@
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-1 14:26
+7 19:17
-"PO-Revision-Date: 2006-04-15 17:38-0600\n"
-"Last-Translator: Travis Shirk <travis@pobox.com>\n"
@@ -101 +101 @@
-
-#. Tooltip strings
-4
+2
-msgid "Play"
-msgstr "Juego"
@@ -175 +175 @@
-#. TRANSLATORS: Replace this string with your names, one name per line.
-#: ../src/mesk_gui.glade.h:39
-Travis Shirk (via Babelfish)
-es: Travis Shirk (via Babelfish)
+Babelfish
+
-
-#: ../src/plugins/plugins_gui.glade.h:1
@@ -218 +218 @@
-msgstr "Configuración de last.fm"
-
-
+
+
+
+
+
+
+
+
-msgid "Pause"
-msgstr "Pausa"
-
-2
+0
-#, python-format
-msgid "Gstreamer version %d.%d.%d audio control initialized"
@@ -261 +268 @@
-msgstr "La gerencia de la sesión inhabilitó (ningún módulo de gnome.ui)"
-
-69 ../src/main_window.py:302
+71 ../src/main_window.py:305
-#, python-format
-msgid "Volume %d%%"
-msgstr ""
-
-4
+6
-#, python-format
-msgid "Error loading playlist '%s'"
-msgstr "Playlist '%s' del cargamento del error"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-#, python-format
-msgid "Unsupported audio format: %s"
-msgstr "Formato audio sin apoyo: %s"
-
-_source.py:115
-
-loading source file
-Archivo de fuente del cargamento del error
-
-_source.py:121
-
-Unsupported audio URI scheme
-Esquema sin apoyo del audio URI
+/mp3.py:56
+fuzzy, 
+reading mp3 source for '%s':
+Metadata de la fuente de la lectura de error en '%s':
+
+/oggvorbis.py:53
+fuzzy, 
+Error reading ogg/vorbis source for '%s'
+Metadata de la fuente de la lectura de error en '%s'
-
-#: ../src/mesk/__init__.py:57
@@ -481 +469 @@
-
-#. Text columns
-49
+50
-msgid "Title"
-msgstr "Título"
-
-0
+1
-msgid "Artist"
-msgstr "Artista"
-
-1
+2
-msgid "Album"
-msgstr "Álbum"
-
-2
+3
-msgid "#"
-msgstr "#"
-
-3
+4
-msgid "Year"
-msgstr "Año"
-
-4
+5
-msgid "Time"
-msgstr "Tiempo"
-
-5
+6
-msgid "tracks"
-msgstr "pistas"
@@ -531 +519 @@
-msgstr "Agregue La Música"
-
-
-
-
-
-
+
-msgid "Playlists"
-msgstr "Playlists"
@@ -542 +526 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-0
+9
-msgid "Make the _dialog be able/unable to select directories"
-msgstr "Haga que el _diálogo es able/unable para seleccionar directorios"
-
-52
+61
-#, python-format
-msgid "'%s' string not found"
@@ -681 +665 @@
-msgstr "Error plugin de la desactivación"
-
+#~ msgid "es: Travis Shirk (via Babelfish)"
+#~ msgstr "es: Travis Shirk (via Babelfish)"
+
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#~ msgid "No metadata for file '%s'"
+#~ msgstr "Ningún metadata para el archivo '%s'"
+
+#, fuzzy
+#~ msgid "Unknown file type: %s"
+#~ msgstr "Tipo desconocido: %s"
+
+#~ msgid "Error loading source file %s"
+#~ msgstr "Archivo de fuente del cargamento del error %s"
+
+#~ msgid "Unsupported audio URI scheme: %s"
+#~ msgstr "Esquema sin apoyo del audio URI: %s"
+
+#~ msgid "MP3s"
+#~ msgstr "MP3s"
+
-#~ msgid "No GStreamer audio sink for '%s'"
-#~ msgstr "Ningún fregadero audio de GStreamer para ' %s'"

trunk/po/mesk.pot

@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-1 14:26
+7 19:17
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -102 +102 @@
-
-#. Tooltip strings
-4
+2
-msgid "Play"
-msgstr ""
@@ -176 +176 @@
-#. TRANSLATORS: Replace this string with your names, one name per line.
-#: ../src/mesk_gui.glade.h:39
-Travis Shirk (via Babelfish)
+Babelfish
-msgstr ""
-
@@ -217 +217 @@
-msgstr ""
-
-
+
+
+
+
+
+
+
-msgid "Pause"
-msgstr ""
-
-2
+0
-#, python-format
-msgid "Gstreamer version %d.%d.%d audio control initialized"
@@ -256 +262 @@
-msgstr ""
-
-69 ../src/main_window.py:302
+71 ../src/main_window.py:305
-#, python-format
-msgid "Volume %d%%"
-msgstr ""
-
-4
+6
-#, python-format
-msgid "Error loading playlist '%s'"
-msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-#, python-format
-msgid "Unsupported audio format: %s"
-msgstr ""
-
-_source.py:115
-
-loading source file
-
-
-_source.py:121
-
-Unsupported audio URI scheme
+/mp3.py:56
+
+reading mp3 source for '%s':
+
+
+/oggvorbis.py:53
+
+Error reading ogg/vorbis source for '%s'
-msgstr ""
-
@@ -469 +456 @@
-
-#. Text columns
-49
+50
-msgid "Title"
-msgstr ""
-
-0
+1
-msgid "Artist"
-msgstr ""
-
-1
+2
-msgid "Album"
-msgstr ""
-
-2
+3
-msgid "#"
-msgstr ""
-
-3
+4
-msgid "Year"
-msgstr ""
-
-4
+5
-msgid "Time"
-msgstr ""
-
-5
+6
-msgid "tracks"
-msgstr ""
@@ -517 +504 @@
-msgstr ""
-
-
-
-
-
-
+
-msgid "Playlists"
-msgstr ""
@@ -528 +511 @@
-#. the checkbox is toggles and files when not since this is not
-#. possible by default
-0
+9
-msgid "Make the _dialog be able/unable to select directories"
-msgstr ""
-
-52
+61
-#, python-format
-msgid "'%s' string not found"

trunk/setup.py.in

@@ -11 +11 @@
-            'mesk.common',
-            'mesk.plugin',
+            'mesk.audio',
-           ],
-  package_dir={'mesk': 'src/mesk',
-               'mesk.common': 'src/mesk/common',
-               'mesk.plugin': 'src/mesk/plugin',
+               'mesk.audio': 'src/mesk/audio',
-              }
-)

trunk/src/about_dialog.py

@@ -21 +21 @@
-
-import mesk
-_ = mesk.common.i18n.
+from mesk.common.i18n import 
-
-class AboutDialog:
@@ -31 +31 @@
-        self.dialog.set_license(mesk.info.GPLV2_LICENCE)
-
+        img = gtk.Image()
+        img.set_from_file('images/mesk_felon.png')
+        self.dialog.set_logo(img.get_pixbuf())
+
+        # XXX: How to get markup in the comments??
+        # Dependency and format support
+        formats = '%s\n' % _('Supported audio formats:')
+        exts = mesk.audio.supported_extensions.keys()
+        exts.sort()
+        formats += ','.join(exts)
+        #for ext in mesk.audio.supported_extensions:
+        #    formats += '%s\n' % mt
+
+        self.dialog.set_comments(formats)
+

trunk/src/audio_control.py

@@ -21 +21 @@
-import os, gobject
-
-import pygst
-pygst.require('0.10')
-import gst
-
@@ -474 +472 @@
-            src.meta_data.track_total = taglist['track-count']
-        if 'duration' in keys:
-audio_info
+meta_data
-        self.emit('tag-update', src)
-
@@ -524 +522 @@
-            # _duration not used, it fluctuates and the label total should
-            # be static
-audio_info
+meta_data
-        else:
-            p = d = 0

trunk/src/mesk/__init__.py

@@ -34 +34 @@
-GLADE_XML = 'mesk_gui.glade'
-
-S
+Config s
-CONFIG_MAIN     = 'mesk'
-CONFIG_UI       = 'ui'
@@ -127 +127 @@
-import mesk.playlist
-import mesk.utils
-_source
+

trunk/src/mesk/playlist.py

@@ -21 +21 @@
-import random
-
-_
+.
-import utils
-import log
@@ -46 +46 @@
-            continue
-        try:
-_source
+
-        except Exception, ex:
-            log.warn(str(ex))

trunk/src/mesk_gui.glade

@@ -977 +977 @@
-  <property name="authors">Travis Shirk &lt;travis@pobox.com&gt;</property>
-  <property name="artists"></property>
-Travis Shirk (via Babelfish)
+Babelfish
-</widget>
-

trunk/src/playlist_control.py

@@ -28 +28 @@
-
-import gtk_utils, config, control
-
+
+
-
-# Data model.  These do not have to correspond to the column order, nor
@@ -230 +231 @@
-        row_data[MODEL_NUM] = track_num
-
-audio_info
+meta_data
-        row_data[MODEL_TIME] = duration
-        
@@ -468 +469 @@
-
-            for src in self._playlist:
-audio_info
-audio_info
-audio_info
-audio_info
+meta_data
+meta_data
+meta_data
+meta_data
-        else:
-            if count_inc:
@@ -517 +518 @@
-
-            src = self._playlist[row]
-audio_info
-audio_info
+meta_data
+meta_data
-
-            # The rows are in ascending order, so each will adjust as we delete
@@ -771 +772 @@
-                            del pl
-                        else:
-_source
+
-                            srcs.append(src)
-                    except UnsupportedFormat, ex:
@@ -786 +787 @@
-                            while gtk.events_pending():
-                                gtk.main_iteration(False)
-
-
+
-                msg = _('Error dropping source: %s\n\n%s') % (uri.path, str(ex))
-                mesk.log.error(msg)
@@ -825 +825 @@
-
-        self._update_playlist_stats(count_inc=1,
-audio_info
-audio_info
+meta_data
+meta_data
-        self.emit('playlist_changed')
-        return new_row
@@ -845 +845 @@
-        dialog.set_current_folder(self._pl_config.file_add_dir)
-
+        filters = []
-        mp3_filter = gtk.FileFilter()
-_('MP3s')
+'MP3s'
-        mp3_filter.add_pattern('*.mp3')
-        dialog.add_filter(mp3_filter)
+        filters.append(mp3_filter)
-
-        m3u_filter = gtk.FileFilter()
@@ -854 +856 @@
-        m3u_filter.add_pattern('*.m3u')
-        dialog.add_filter(m3u_filter)
+        filters.append(m3u_filter)
+
+        ogg_filter = gtk.FileFilter()
+        ogg_filter.set_name('Oggs')
+        ogg_filter.add_pattern('*.ogg')
+        dialog.add_filter(ogg_filter)
+        filters.append(ogg_filter)
-
-        # This madness allows the file dialog to select directories when
@@ -864 +873 @@
-            if button.get_active():
-                dialog.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
-dialog.remove_filter(mp3_filter)
-dialog.remove_filter(m3u_filter
+for f in filters:
+    dialog.remove_filter(f
-            else:
-                dialog.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
-dialog.add_filter(mp3_filter)
-dialog.add_filter(m3u_filter
+for f in filters:
+    dialog.add_filter(f
-        dir_check.connect('toggled', on_toggled, dialog)
-

trunk/src/plugins/audioscrobbler.py

@@ -393 +393 @@
-        if audio_src:
-            # Half the song or 240s, whichever is shorter
-audio_info
+meta_data
-            if src_len < 30:
-                self.log.info(_('Source length %s < 30s, skipping') % \
@@ -426 +426 @@
-        post['b[%(index)d]'] = album.encode('utf-8')
-        post['m[%(index)d]'] = ''
-audio_info
+meta_data
-        post['i[%(index)d]'] = self.time_stamp()
-