Author: duncan
Date: Sat Oct 28 21:40:13 2006
New Revision: 8497
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/audio/__init__.py
branches/rel-1/freevo/src/audio/plugins/radioplayer.py
branches/rel-1/freevo/src/util/mediainfo.py
Log:
Merged changed from rel-1-6
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Sat Oct 28 21:40:13 2006
@@ -231,6 +231,7 @@
Added XINE_TV_VO_DEV, XINE_TV_AO_DEV, and XINE_TV_TIMESHIFT_FILEMASK for
the
new tv.ivtv_xine_tv plugin (the latter should be e.g. "/tmp/xine-buf-"
and point
to a place with enough free diskspace (several gigabytes).
+ Added RADIO_IN_VOLUME for different volumes levels for TV and radio
Added TV_RECORD_PADDING_PRE/POST for separately setting
TV_RECORD_PADDING
Added TV_RECORDFILE_OKLETTERS for characters allowed in recording
filenames.
Added AUTOSHUTDOWN_ settings to turn off and on the machine automatically
@@ -279,12 +280,13 @@
AUDIO_DEVICE = '/dev/dsp' # e.g.: /dev/dsp0, /dev/audio, /dev/alsa/?
AUDIO_INPUT_DEVICE = '/dev/dsp1' # e.g.: /dev/dsp0, /dev/audio, /dev/alsa/?
MAJOR_AUDIO_CTRL = 'VOL' # Freevo takes control over one audio ctrl
- # 'VOL', 'PCM' 'OGAIN' etc.
+ # 'VOL', 'PCM' 'OGAIN' etc.
CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control of
audio
MAX_VOLUME = 90 # Set what you want maximum volume level
to be.
DEFAULT_VOLUME = 40 # Set default volume level.
TV_IN_VOLUME = 60 # Set this to your preferred level 0-100.
VCR_IN_VOLUME = 90 # If you use different input from TV
+RADIO_IN_VOLUME = 80 # Set this to your preferred level 0-100.
DEV_MIXER = '/dev/mixer' # mixer device
START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
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 Sat Oct 28 21:40:13 2006
@@ -1,4 +1,3 @@
-#if 0
# -----------------------------------------------------------------------
# freevo_config.py - System configuration
# -----------------------------------------------------------------------
@@ -37,7 +36,6 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# -----------------------------------------------------------------------
-#endif
@@ -48,20 +46,21 @@
# General freevo settings:
# ======================================================================
-# AUDIO_DEVICE = '/dev/dsp' # e.g.: /dev/dsp0, /dev/audio,
/dev/alsa/?
-# AUDIO_INPUT_DEVICE = '/dev/dsp1' # e.g.: /dev/dsp0, /dev/audio,
/dev/alsa/?
-# MAJOR_AUDIO_CTRL = 'VOL' # Freevo takes control over one audio
ctrl
- # 'VOL', 'PCM' 'OGAIN' etc.
-# CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control
of audio
-# MAX_VOLUME = 90 # Set what you want maximum volume
level to be.
-# DEFAULT_VOLUME = 40 # Set default volume level.
-# TV_IN_VOLUME = 60 # Set this to your preferred level
0-100.
-# VCR_IN_VOLUME = 90 # If you use different input from TV
-# DEV_MIXER = '/dev/mixer' # mixer device
+# AUDIO_DEVICE = '/dev/dsp' # e.g.: /dev/dsp0, /dev/audio,
/dev/alsa/?
+# AUDIO_INPUT_DEVICE = '/dev/dsp1' # e.g.: /dev/dsp0, /dev/audio,
/dev/alsa/?
+# MAJOR_AUDIO_CTRL = 'VOL' # Freevo takes control over one audio
ctrl
+ # 'VOL', 'PCM' 'OGAIN' etc.
+# CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control
of audio
+# MAX_VOLUME = 90 # Set what you want maximum volume
level to be.
+# DEFAULT_VOLUME = 40 # Set default volume level.
+# TV_IN_VOLUME = 60 # Set this to your preferred level
0-100.
+# VCR_IN_VOLUME = 90 # If you use different input from TV
+# RADIO_IN_VOLUME = 80 # Set this to your preferred level
0-100.
+# DEV_MIXER = '/dev/mixer' # mixer device
-# START_FULLSCREEN_X = 0 # Start in fullscreen mode if using
x11 or xv.
+# START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
-# CONFIRM_SHUTDOWN = 1 # ask before shutdown
+# CONFIRM_SHUTDOWN = 1 # ask before shutdown
#
# Physical ROM drives, multiple ones can be specified
Modified: branches/rel-1/freevo/src/audio/__init__.py
==============================================================================
--- branches/rel-1/freevo/src/audio/__init__.py (original)
+++ branches/rel-1/freevo/src/audio/__init__.py Sat Oct 28 21:40:13 2006
@@ -85,7 +85,7 @@
"""
set informations for a diritem based on the content, etc.
"""
- if not diritem.image:
+ if not diritem.image and os.path.exists(diritem.dir):
timestamp = os.stat(diritem.dir)[stat.ST_MTIME]
if not diritem['coversearch_timestamp'] or \
timestamp > diritem['coversearch_timestamp']:
Modified: branches/rel-1/freevo/src/audio/plugins/radioplayer.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/radioplayer.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/radioplayer.py Sat Oct 28
21:40:13 2006
@@ -91,14 +91,11 @@
except AttributeError:
pass
- self.mode = 'play'
+ self.mode = 'play'
mixer = plugin.getbyname('MIXER')
if mixer:
- if hasattr(config, 'RADIO_IN_VOLUME'):
- mixer_vol = config.RADIO_IN_VOLUME
- else:
- mixer_vol = config.TV_IN_VOLUME
+ mixer_vol = config.RADIO_IN_VOLUME
mixer.setLineinVolume(mixer_vol)
mixer.setIgainVolume(mixer_vol)
mixer.setMicVolume(mixer_vol)
Modified: branches/rel-1/freevo/src/util/mediainfo.py
==============================================================================
--- branches/rel-1/freevo/src/util/mediainfo.py (original)
+++ branches/rel-1/freevo/src/util/mediainfo.py Sat Oct 28 21:40:13 2006
@@ -543,8 +543,8 @@
# create a list of all subdirs
for dir in dirlist:
for dirname in util.get_subdirs_recursively(dir):
- if not dirname in all_dirs and not \
- os.path.basename(dirname) in ('.xvpics', '.thumbnails',
'CVS'):
+ if not dirname in all_dirs and \
+ not os.path.basename(dirname) in ('.xvpics', '.thumbnails',
'CVS'):
all_dirs.append(dirname)
if not dir in all_dirs:
all_dirs.append(dir)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
