Author: duncan
Date: Thu Dec 14 19:43:19 2006
New Revision: 8722
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/audio/plugins/cdbackup.py
Log:
Merged fixes from rel-1-6
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Thu Dec 14 19:43:19 2006
@@ -38,10 +38,11 @@
* Updated recordserver to allow automatic deleting of old recordings when low
on disk space (F#1594630)
* Updated tv mplayer plug-in to pause live tv and change channels without
stopping for dvb (F#1610656)
-== Release 1.6.2 (2006-??-??) ==
+== Release 1.6.2 (2006-12-22) ==
--------------------------------
* Fixed audio track name formatting (B#1605570,B#1605042)
+ * Fixed cdbackup plug-in to correctly execute lame (B#1615970)
* Fixed weather unicode problem (B#1612617)
* Updated autoshutdown to react to the return code and removed unused vars
(B#1612257)
* Updated osd forced fonts variables and freevo_config and local_conf
(B#1608393)
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Thu Dec 14 19:43:19 2006
@@ -259,6 +259,8 @@
Added USE_SDL_KEYBOARD to specify if generic keyboard handler should be
used
Added EVENT_DEVS and EVENTMAP for the new Linux event device handler
Added VIDEO_PRE_PLAY and VIDEO_POST_PLAY to allow external commands to be
run
+ Added CDBURN_ for the cd burning plug-in
+ Added CD_RIP_ for the cd backup plug-in
''' ),
]
@@ -757,6 +759,26 @@
('Freevo donors',
'http://sourceforge.net/export/rss2_projdonors.php?group_id=46652'),
]
+# ----------------------------------------------------------------------
+# CD Ripping
+# ----------------------------------------------------------------------
+CD_RIP_TMP_DIR = '/tmp/'
+CD_RIP_TMP_NAME = 'track_%(track)s_being_ripped'
+CD_RIP_PN_PREF = '%(artist)s/%(album)s/%(track)s - %(song)s'
+CD_RIP_LAME_OPTS = '--vbr-new -b 192 -h'
+CD_RIP_OGG_OPTS = '-m 128'
+CD_RIP_FLAC_OPTS = '-8'
+
+# ----------------------------------------------------------------------
+# CD Burning
+# ----------------------------------------------------------------------
+CDBURN_AUDIO_DAO = 1
+CDBURN_MKISOFS_PATH = '/usr/bin/mkisofs'
+CDBURN_CDRECORD_PATH = '/usr/bin/cdrecord'
+CDBURN_TEMP_DIR='/tmp/'
+CDBURN_DEV = '/dev/cdrom'
+CDBURN_SPEED = 32
+
# ======================================================================
# Freevo directory settings:
# ======================================================================
Modified: branches/rel-1/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Thu Dec 14 19:43:19 2006
@@ -381,26 +381,33 @@
# To turn off Headlines add plugin.remove('headlines')
# ----------------------------------------------------------------------
#plugin.activate('headlines', level=45)
-#HEADLINES_LOCATIONS = [
+# HEADLINES_LOCATIONS = [
# ('Freevo news releases',
'http://sourceforge.net/export/rss2_projnews.php?group_id=46652'),
# ('Freevo file releases',
'http://sourceforge.net/export/rss2_projfiles.php?group_id=46652'),
# ('Freevo summary+stats',
'http://sourceforge.net/export/rss2_projsummary.php?group_id=46652'),
# ('Freevo donors',
'http://sourceforge.net/export/rss2_projdonors.php?group_id=46652'),
-#]
+# ]
+# ----------------------------------------------------------------------
+# CD Ripping
+# ----------------------------------------------------------------------
+# CD_RIP_TMP_DIR = '/tmp/'
+# CD_RIP_TMP_NAME = 'track_%(track)s_being_ripped'
+# CD_RIP_PN_PREF = '%(artist)s/%(album)s/%(track)s - %(song)s'
+# CD_RIP_LAME_OPTS = '--vbr-new -b 192 -h'
+# CD_RIP_OGG_OPTS = '-m 128'
+# CD_RIP_FLAC_OPTS = '-8'
# ----------------------------------------------------------------------
# CD Burning
# ----------------------------------------------------------------------
-# plugin.activate('cd_burn')
# CDBURN_AUDIO_DAO = 1
# CDBURN_MKISOFS_PATH = '/usr/bin/mkisofs'
# CDBURN_CDRECORD_PATH = '/usr/bin/cdrecord'
# CDBURN_TEMP_DIR='/tmp/'
-# CDBURN_DEV = '/dev/hdc'
+# CDBURN_DEV = '/dev/cdrom'
# CDBURN_SPEED = 32
-
# ======================================================================
# Freevo directory settings:
# ======================================================================
Modified: branches/rel-1/freevo/src/audio/plugins/cdbackup.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/cdbackup.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/cdbackup.py Thu Dec 14 19:43:19 2006
@@ -167,7 +167,7 @@
('CD_RIP_PN_PREF', '%(artist)s/%(album)s/%(song)s', ''),
('CD_RIP_LAME_OPTS', '--preset standard', ''),
('CD_RIP_OGG_OPTS', '-m 128', ''),
- ('FLAC_OPTS', '-8', '8==Best, but slowest compression'),
+ ('CD_RIP_FLAC_OPTS', '-8', '8==Best, but slowest compression'),
('RIP_TITLE_CASE','0',
'Autoconvert all track/album/artist names to title case'))
@@ -345,6 +345,7 @@
'album': album,
'genre': genre,
'track': track,
+ 'tracks': len(song_names),
'song': song_names[i] }
path_tail = path_tail_temp % user_rip_path_prefs
@@ -354,8 +355,8 @@
if (string.upper(rip_format) == 'MP3') or \
(string.upper(rip_format) == 'OGG') or \
(string.upper(rip_format) == 'FLAC'):
- pathname_cdparanoia = '/tmp'
- path_tail_cdparanoia = '/track_being_ripped'
+ pathname_cdparanoia = config.CD_RIP_TMP_DIR
+ path_tail_cdparanoia = config.CD_RIP_TMP_NAME %
user_rip_path_prefs
keep_wav = False
# Otherwise if it's going to be a .wav just use the the users
preferred
@@ -391,29 +392,15 @@
# Build the lame command to be run if mp3 format is selected
if string.upper(rip_format) == 'MP3':
output = '%s%s.mp3' % (pathname, path_tail)
- cmd = str('%s --nohist -h %s' % (config.LAME_CMD,
config.CD_RIP_LAME_OPTS))
- cmd += ' --tt "%s" --ta "%s" --tl "%s" --tn %s,%s
--id3v2-only' % \
- ( song_names[i], artist, album, track,
len(song_names))
-
- cmd = cmd.split(' ') + [ wav_file, output ]
+ cmd = str('%s %s' % (config.LAME_CMD, config.CD_RIP_LAME_OPTS))
+ cmd = cmd.split(' ') + \
+ [ '--tt', song_names[i], '--ta', artist, '--tl', album,
+ '--tn', '%(track)s,%(tracks)s' % user_rip_path_prefs,
+ '--tg', genre, '--id3v2-only', wav_file, output ]
_debug_('lame: %s' % cmd)
popen3.run(cmd, self, 9)
- try:
- if not self.abort:
- _debug_('\"%s\" title=\"%s\" artist=\"%s\"
album=\"%s\" track=\"%s\" tracktotal=\"%s\"' % \
- (pathname+path_tail+'.mp3', song_names[i], artist,
album, track, len(song_names)))
- util.tagmp3(pathname+path_tail+'.mp3',
title=song_names[i],
- artist=artist, album=album, track=track,
- tracktotal=len(song_names))
- except IOError:
- # This sometimes fails if the CD has a data track
- # This is not a 100% fix, but temporary until I figure out
why
- # it's trying to tag a data track
- pass
-
-
# Build the oggenc command to be run if ogg format is selected
elif string.upper(rip_format) == 'OGG':
output = '%s%s.ogg' % (pathname, path_tail)
@@ -429,7 +416,7 @@
# Build the flacenc command
elif string.upper(rip_format) == 'FLAC':
output = '%s%s.flac' % (pathname, path_tail)
- cmd = '%s %s' % ( config.FLAC_CMD, config.FLAC_OPTS )
+ cmd = '%s %s' % ( config.FLAC_CMD, config.CD_RIP_FLAC_OPTS )
cmd = cmd.split(' ') + [ wav_file, '-o', output ]
metaflac_command = \
-------------------------------------------------------------------------
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
