Author: duncan
Date: Sat Apr 21 11:16:09 2007
New Revision: 9488
Modified:
branches/rel-1/freevo/src/skins/main/xml_skin.py
branches/rel-1/freevo/src/tv/channels.py
branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py
branches/rel-1/freevo/src/tv/plugins/mplayer.py
branches/rel-1/freevo/src/tv/plugins/xawtv.py
branches/rel-1/freevo/src/tv/program_search.py
Log:
Changed hard-coded tv time format
Modified: branches/rel-1/freevo/src/skins/main/xml_skin.py
==============================================================================
--- branches/rel-1/freevo/src/skins/main/xml_skin.py (original)
+++ branches/rel-1/freevo/src/skins/main/xml_skin.py Sat Apr 21 11:16:09 2007
@@ -1105,4 +1105,3 @@
print "ERROR: XML file corrupt"
traceback.print_exc()
return 0
-
Modified: branches/rel-1/freevo/src/tv/channels.py
==============================================================================
--- branches/rel-1/freevo/src/tv/channels.py (original)
+++ branches/rel-1/freevo/src/tv/channels.py Sat Apr 21 11:16:09 2007
@@ -261,8 +261,8 @@
stop=time.time(),
chanids=[chan_id])
if channels and channels[0] and channels[0].programs:
- start_s = time.strftime('%H:%M',
time.localtime(channels[0].programs[0].start))
- stop_s = time.strftime('%H:%M',
time.localtime(channels[0].programs[0].stop))
+ start_s = time.strftime(config.TV_TIMEFORMAT,
time.localtime(channels[0].programs[0].start))
+ stop_s = time.strftime(config.TV_TIMEFORMAT,
time.localtime(channels[0].programs[0].stop))
ts = '(%s-%s)' % (start_s, stop_s)
prog_info = '%s %s' % (ts, channels[0].programs[0].title)
else:
Modified: branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py Sat Apr 21
11:16:09 2007
@@ -488,7 +488,7 @@
# todo: insert xine OSD message here ...
# tuner_id, chan_name, prog_info = self.fc.getChannelInfo()
- # now = time.strftime("%H:%M")
+ # now = time.strftime(config.TV_TIMEFORMAT)
# msg = "%s %s (%s): %s" % (now, chan_name, tuner_id, prog_info)
# cmd = "osd_show_text '%s'\n" % msg
# todo: insert xine OSD message here ...
Modified: branches/rel-1/freevo/src/tv/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/mplayer.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/mplayer.py Sat Apr 21 11:16:09 2007
@@ -291,7 +291,7 @@
# Display a channel changed message
tuner_id, chan_name, prog_info = self.fc.getChannelInfo()
- now = time.strftime('%H:%M')
+ now = time.strftime(config.TV_TIMEFORMAT)
msg = '%s %s (%s): %s' % (now, chan_name, tuner_id, prog_info)
cmd = 'osd_show_text "%s"\n' % msg
self.app.write(cmd)
@@ -300,7 +300,7 @@
elif event == em.TOGGLE_OSD:
# Display the channel info message
tuner_id, chan_name, prog_info = self.fc.getChannelInfo()
- now = time.strftime('%H:%M')
+ now = time.strftime(config.TV_TIMEFORMAT)
msg = '%s %s (%s): %s' % (now, chan_name, tuner_id, prog_info)
cmd = 'osd_show_text "%s"\n' % msg
self.app.write(cmd)
Modified: branches/rel-1/freevo/src/tv/plugins/xawtv.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/xawtv.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/xawtv.py Sat Apr 21 11:16:09 2007
@@ -104,8 +104,8 @@
stop=time.time(),
chanids=[chan_id])
if channels and channels[0] and channels[0].programs:
- start_s = time.strftime('%H:%M',
time.localtime(channels[0].programs[0].start))
- stop_s = time.strftime('%H:%M',
time.localtime(channels[0].programs[0].stop))
+ start_s = time.strftime(config.TV_TIMEFORMAT,
time.localtime(channels[0].programs[0].start))
+ stop_s = time.strftime(config.TV_TIMEFORMAT,
time.localtime(channels[0].programs[0].stop))
ts = '(%s-%s)' % (start_s, stop_s)
prog_info = '%s %s' % (ts, channels[0].programs[0].title)
else:
Modified: branches/rel-1/freevo/src/tv/program_search.py
==============================================================================
--- branches/rel-1/freevo/src/tv/program_search.py (original)
+++ branches/rel-1/freevo/src/tv/program_search.py Sat Apr 21 11:16:09 2007
@@ -131,11 +131,8 @@
for prog in matches:
i += 1
self.results.add_item(text='%s %s: %s' % \
- (time.strftime('%b %d %I:%M %p',
- time.localtime(prog.start)),
-
tv_util.get_chan_displayname(prog.channel_id),
- prog.title),
- value=prog)
+ (time.strftime(config.TV_DATETIMEFORMAT,
time.localtime(prog.start)),
+ tv_util.get_chan_displayname(prog.channel_id),
prog.title), value=prog)
space_left = self.num_shown_items - i
if space_left > 0:
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
