[Freevo-cvslog] freevo/src/tv/plugins scheduled_recordings.py,1.2,1.3
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24871/src/tv/plugins
Modified Files:
scheduled_recordings.py
Log Message:
Refresh the list of scheduled recordings when we reload the menu.
Index: scheduled_recordings.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/scheduled_recordings.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** scheduled_recordings.py 23 Feb 2004 08:22:10 - 1.2
--- scheduled_recordings.py 13 Mar 2004 17:12:49 - 1.3
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.3 2004/03/13 17:12:49 rshortt
+ # Refresh the list of scheduled recordings when we reload the menu.
+ #
# Revision 1.2 2004/02/23 08:22:10 gsbarbieri
# i18n: help translators job.
***
*** 49,52
--- 52,56
import tv.record_client as record_client
+ from gui.AlertBox import AlertBox
from item import Item
from tv.program_display import ProgramItem
***
*** 57,60
--- 61,65
Item.__init__(self, parent, skin_type='tv')
self.name = _('Scheduled Recordings')
+ self.menuw = None
***
*** 64,74
def display_schedule(self, arg=None, menuw=None):
items = []
(server_available, msg) = record_client.connectionTest()
if not server_available:
! AlertBox(_('Recording server is unavailable.')+(': %s' % msg),
! self, Align.CENTER).show()
! return
(result, recordings) = record_client.getScheduledRecordings()
--- 69,111
def display_schedule(self, arg=None, menuw=None):
+ items = self.get_items()
+ if not len(items):
+ AlertBox(_('Nothing scheduled.')).show()
+ return
+
+ schedule_menu = menu.Menu(_( 'Scheduled Recordings'), items,
+ reload_func = self.reload,
+ item_types = 'tv program menu')
+ self.menuw = menuw
+ rc.app(None)
+ menuw.pushmenu(schedule_menu)
+ menuw.refresh()
+
+
+ def reload(self):
+ menuw = self.menuw
+
+ menu = menuw.menustack[1]
+
+ sel = menu.choices.index(menu.selected)
+ new_choices = self.get_items()
+ if not menu.selected in new_choices:
+ if len(new_choices) = sel:
+ menu.selected = new_choices[-1]
+ else:
+ menu.selected = new_choices[sel]
+
+ menu.choices = new_choices
+
+ return menu
+
+
+ def get_items(self):
items = []
(server_available, msg) = record_client.connectionTest()
if not server_available:
! AlertBox(_('Recording server is unavailable.')+(': %s' % msg)).show()
! return None
(result, recordings) = record_client.getScheduledRecordings()
***
*** 82,94
items.append(ProgramItem(self, prog, context='schedule'))
else:
! AlertBox(_('Get recordings failed')+(': %s' % recordings),
! self, Align.CENTER).show()
! return
! schedule_menu = menu.Menu(_( 'Scheduled Recordings'), items,
! item_types = 'tv program menu')
! rc.app(None)
! menuw.pushmenu(schedule_menu)
! menuw.refresh()
--- 119,126
items.append(ProgramItem(self, prog, context='schedule'))
else:
! AlertBox(_('Get recordings failed')+(': %s' % recordings)).show()
! return None
! return items
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins scheduled_recordings.py,1.3,1.4
Update of /cvsroot/freevo/freevo/src/tv/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28253/src/tv/plugins Modified Files: scheduled_recordings.py Log Message: Fix the menu index. Index: scheduled_recordings.py === RCS file: /cvsroot/freevo/freevo/src/tv/plugins/scheduled_recordings.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** scheduled_recordings.py 13 Mar 2004 17:12:49 - 1.3 --- scheduled_recordings.py 13 Mar 2004 17:31:01 - 1.4 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.4 2004/03/13 17:31:01 rshortt + # Fix the menu index. + # # Revision 1.3 2004/03/13 17:12:49 rshortt # Refresh the list of scheduled recordings when we reload the menu. *** *** 86,90 menuw = self.menuw ! menu = menuw.menustack[1] sel = menu.choices.index(menu.selected) --- 89,93 menuw = self.menuw ! menu = menuw.menustack[-1] sel = menu.choices.index(menu.selected) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/www/htdocs favorites.rpy,1.14,1.15
Update of /cvsroot/freevo/freevo/src/www/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8582/src/www/htdocs
Modified Files:
favorites.rpy
Log Message:
Make sure the dow key is a str.
Index: favorites.rpy
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/favorites.rpy,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** favorites.rpy 23 Feb 2004 08:33:21 - 1.14
--- favorites.rpy 13 Mar 2004 18:32:29 - 1.15
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.15 2004/03/13 18:32:29 rshortt
+ # Make sure the dow key is a str.
+ #
# Revision 1.14 2004/02/23 08:33:21 gsbarbieri
# i18n: help translators job.
***
*** 191,196
if fav.dow != 'ANY':
! # cell = time.strftime('%b %d %H:%M', time.localtime(fav.start))
! cell = '%s' % days[fav.dow]
else:
cell = _('ANY')
--- 194,198
if fav.dow != 'ANY':
! cell = '%s' % days[str(fav.dow)]
else:
cell = _('ANY')
***
*** 198,202
if fav.mod != 'ANY':
- # cell = time.strftime('%b %d %H:%M', time.localtime(fav.start))
cell = '%s' % tv_util.minToTOD(fav.mod)
else:
--- 200,203
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins scheduled_recordings.py,1.4,1.5
Update of /cvsroot/freevo/freevo/src/tv/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8738/src/tv/plugins Modified Files: scheduled_recordings.py Log Message: Handle an empty list better (still needs improving). Index: scheduled_recordings.py === RCS file: /cvsroot/freevo/freevo/src/tv/plugins/scheduled_recordings.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** scheduled_recordings.py 13 Mar 2004 17:31:01 - 1.4 --- scheduled_recordings.py 13 Mar 2004 18:33:17 - 1.5 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.5 2004/03/13 18:33:17 rshortt + # Handle an empty list better (still needs improving). + # # Revision 1.4 2004/03/13 17:31:01 rshortt # Fix the menu index. *** *** 91,97 menu = menuw.menustack[-1] - sel = menu.choices.index(menu.selected) new_choices = self.get_items() ! if not menu.selected in new_choices: if len(new_choices) = sel: menu.selected = new_choices[-1] --- 94,100 menu = menuw.menustack[-1] new_choices = self.get_items() ! if not menu.selected in new_choices and len(new_choices): ! sel = menu.choices.index(menu.selected) if len(new_choices) = sel: menu.selected = new_choices[-1] --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins view_favorites.py,1.2,1.3
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9021/src/tv/plugins
Modified Files:
view_favorites.py
Log Message:
Refresh the list of favorites from the server properly.
Index: view_favorites.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/view_favorites.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** view_favorites.py 13 Mar 2004 03:28:06 - 1.2
--- view_favorites.py 13 Mar 2004 18:34:19 - 1.3
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.3 2004/03/13 18:34:19 rshortt
+ # Refresh the list of favorites from the server properly.
+ #
# Revision 1.2 2004/03/13 03:28:06 rshortt
# More favorites support... almost there!
***
*** 53,56
--- 56,60
Item.__init__(self, parent, skin_type='tv')
self.name = _('View Favorites')
+ self.menuw = None
***
*** 60,70
def view_favorites(self, arg=None, menuw=None):
items = []
(server_available, msg) = record_client.connectionTest()
if not server_available:
! AlertBox(_('Recording server is unavailable.')+(': %s' % msg),
! self, Align.CENTER).show()
! return
(result, favorites) = record_client.getFavorites()
--- 64,106
def view_favorites(self, arg=None, menuw=None):
+ items = self.get_items()
+ if not len(items):
+ AlertBox(_('No favorites.')).show()
+ return
+
+ favorite_menu = menu.Menu(_( 'View Favorites'), items,
+ reload_func = self.reload,
+ item_types = 'tv favorite menu')
+ self.menuw = menuw
+ rc.app(None)
+ menuw.pushmenu(favorite_menu)
+ menuw.refresh()
+
+
+ def reload(self):
+ menuw = self.menuw
+
+ menu = menuw.menustack[-1]
+
+ new_choices = self.get_items()
+ if not menu.selected in new_choices and len(new_choices):
+ sel = menu.choices.index(menu.selected)
+ if len(new_choices) = sel:
+ menu.selected = new_choices[-1]
+ else:
+ menu.selected = new_choices[sel]
+
+ menu.choices = new_choices
+
+ return menu
+
+
+ def get_items(self):
items = []
(server_available, msg) = record_client.connectionTest()
if not server_available:
! AlertBox(_('Recording server is unavailable.')+(': %s' % msg)).show()
! return []
(result, favorites) = record_client.getFavorites()
***
*** 78,90
else:
! AlertBox(_('Get favorites failed')+(': %s' % favorites),
! self, Align.CENTER).show()
! return
- favorite_menu = menu.Menu(_( 'View Favorites'), items,
- item_types = 'tv favorite menu')
- rc.app(None)
- menuw.pushmenu(favorite_menu)
- menuw.refresh()
--- 114,122
else:
! AlertBox(_('Get favorites failed')+(': %s' % favorites)).show()
! return []
!
! return items
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv record_client.py,1.17,1.18
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27972/src/tv
Modified Files:
record_client.py
Log Message:
Some quick debug for addEditedFavorite()
Index: record_client.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/record_client.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** record_client.py13 Mar 2004 18:31:51 - 1.17
--- record_client.py13 Mar 2004 20:11:36 - 1.18
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.18 2004/03/13 20:11:36 rshortt
+ # Some quick debug for addEditedFavorite()
+ #
# Revision 1.17 2004/03/13 18:31:51 rshortt
# Lets see traceback and exception. We should clean this file up further.
***
*** 214,218
server.addEditedFavorite(jellyToXML(name), \
jellyToXML(title), chan, dow, mod, priority)
! except:
return (FALSE, 'record_client: '+_('connection error'))
--- 217,223
server.addEditedFavorite(jellyToXML(name), \
jellyToXML(title), chan, dow, mod, priority)
! except Exception, e:
! print e
! traceback.print_exc()
return (FALSE, 'record_client: '+_('connection error'))
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins view_favorites.py,1.3,1.4
Update of /cvsroot/freevo/freevo/src/tv/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28212/src/tv/plugins Modified Files: view_favorites.py Log Message: Remove debug. Index: view_favorites.py === RCS file: /cvsroot/freevo/freevo/src/tv/plugins/view_favorites.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** view_favorites.py 13 Mar 2004 18:34:19 - 1.3 --- view_favorites.py 13 Mar 2004 20:12:40 - 1.4 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.4 2004/03/13 20:12:40 rshortt + # Remove debug. + # # Revision 1.3 2004/03/13 18:34:19 rshortt # Refresh the list of favorites from the server properly. *** *** 110,114 favorites.sort(f) for fav in favorites: - print 'FAV: name=%s mod=%s' % (fav.name, fav.mod) items.append(FavoriteItem(self, fav)) --- 113,116 --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv program_display.py,1.33,1.34
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28351/src/tv
Modified Files:
program_display.py
Log Message:
Add 'add to favorites' capabilities. This needs more work and error handling still.
'remove from favorites' isn't implimented yet either.
Index: program_display.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** program_display.py 13 Mar 2004 03:28:06 - 1.33
--- program_display.py 13 Mar 2004 20:14:12 - 1.34
***
*** 10,13
--- 10,17
#---
# $Log$
+ # Revision 1.34 2004/03/13 20:14:12 rshortt
+ # Add 'add to favorites' capabilities. This needs more work and error handling
still.
+ # 'remove from favorites' isn't implimented yet either.
+ #
# Revision 1.33 2004/03/13 03:28:06 rshortt
# More favorites support... almost there!
***
*** 69,72
--- 73,77
from gui.AlertBox import AlertBox
from gui.InputBox import InputBox
+ from tv.record_types import Favorite
DEBUG = config.DEBUG
***
*** 153,157
def add_favorite(self, arg=None, menuw=None):
! pass
--- 158,164
def add_favorite(self, arg=None, menuw=None):
! fav = Favorite(self.prog.title, self.prog, True, True, True, -1)
! fav_item = FavoriteItem(self, fav, fav_action='add')
! fav_item.display_favorite(menuw=menuw)
***
*** 221,229
class FavoriteItem(Item):
! def __init__(self, parent, fav):
Item.__init__(self, parent, skin_type='video')
self.fav = fav
self.name = self.origname = fav.name
self.title = fav.title
self.week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'),
_('Sat'), _('Sun'))
--- 228,237
class FavoriteItem(Item):
! def __init__(self, parent, fav, fav_action='edit'):
Item.__init__(self, parent, skin_type='video')
self.fav = fav
self.name = self.origname = fav.name
self.title = fav.title
+ self.fav_action = fav_action
self.week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'),
_('Sat'), _('Sun'))
***
*** 306,311
def alter_prop(self, arg=(None,None), menuw=None):
(prop, val) = arg
- print 'FAV: prop=%s' % prop
- print 'FAV: val=%s' % val
if prop == 'channel':
--- 314,317
***
*** 377,381
def save_changes(self, arg=None, menuw=None):
! (result, msg) = record_client.removeFavorite(self.origname)
if result:
(result, msg) = record_client.addEditedFavorite(self.fav.name,
--- 383,391
def save_changes(self, arg=None, menuw=None):
! if self.fav_action == 'edit':
! (result, msg) = record_client.removeFavorite(self.origname)
! else:
! result = True
!
if result:
(result, msg) = record_client.addEditedFavorite(self.fav.name,
***
*** 387,392
if not result:
AlertBox(text=_('Save Failed, favorite was lost')+(': %s' %
msg)).show()
! elif menuw:
! menuw.back_one_menu(arg='reload')
else:
--- 397,404
if not result:
AlertBox(text=_('Save Failed, favorite was lost')+(': %s' %
msg)).show()
! else:
! self.fav_action = 'edit'
! if menuw:
! menuw.back_one_menu(arg='reload')
else:
***
*** 395,398
--- 407,414
def rem_favorite(self, arg=None, menuw=None):
+ if self.fav_action == 'add':
+ AlertBox(text=_('Favorite not added yet.')).show()
+ return
+
(result, msg) = record_client.removeFavorite(self.origname)
if result:
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src config.py,1.100,1.101
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31655/src
Modified Files:
config.py
Log Message:
Fix some assumptions with channel detection. Also channel id's are strings,
not ints. I discovered some problems when using an xmltv file generated from
zap2it's data-direct service.
Index: config.py
===
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** config.py 27 Feb 2004 20:10:02 - 1.100
--- config.py 12 Mar 2004 22:01:18 - 1.101
***
*** 23,26
--- 23,31
# ---
# $Log$
+ # Revision 1.101 2004/03/12 22:01:18 rshortt
+ # Fix some assumptions with channel detection. Also channel id's are strings,
+ # not ints. I discovered some problems when using an xmltv file generated from
+ # zap2it's data-direct service.
+ #
# Revision 1.100 2004/02/27 20:10:02 dischi
# helper function to check if an object is some sort of string
***
*** 707,711
if len(l[key]) == 1:
l[key].append(('0',))
! nlist = map(lambda x, key=key: (int(x[key][1][0]), x), list)
nlist.sort()
return map(lambda (key, x): x, nlist)
--- 712,716
if len(l[key]) == 1:
l[key].append(('0',))
! nlist = map(lambda x, key=key: (string.split(x[key][1][0])[0], x), list)
nlist.sort()
return map(lambda (key, x): x, nlist)
***
*** 775,785
if (a['display-name'][1][0][0].isdigit()):
display_name = a['display-name'][0][0].encode(LOCALE, 'ignore')
! tunerid = a['display-name'][1][0].encode(LOCALE, 'ignore')
else:
display_name = a['display-name'][1][0].encode(LOCALE, 'ignore')
! tunerid = a['display-name'][0][0].encode(LOCALE, 'ignore')
id = a['id'].encode(LOCALE, 'ignore')
! chanlist += [(id,display_name,int(tunerid))]
try:
--- 780,790
if (a['display-name'][1][0][0].isdigit()):
display_name = a['display-name'][0][0].encode(LOCALE, 'ignore')
! tunerid = string.split(a['display-name'][1][0].encode(LOCALE,
'ignore'))[0]
else:
display_name = a['display-name'][1][0].encode(LOCALE, 'ignore')
! tunerid = string.split(a['display-name'][0][0].encode(LOCALE,
'ignore'))[0]
id = a['id'].encode(LOCALE, 'ignore')
! chanlist += [(id,display_name,tunerid)]
try:
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main blurr2.fxd,1.52,1.53
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23616/share/skins/main Modified Files: blurr2.fxd Log Message: More favorites support... almost there! Index: blurr2.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** blurr2.fxd 12 Mar 2004 21:10:07 - 1.52 --- blurr2.fxd 13 Mar 2004 03:28:05 - 1.53 *** *** 621,624 --- 621,639 newline/ /if + if expression=channel + text font=info value mode=softChannel: /text + text font=info value expression=channel mode=soft / + newline/ + /if + if expression=dow + text font=info value mode=softDay: /text + text font=info value expression=dow mode=soft / + newline/ + /if + if expression=mod + text font=info value mode=softTime: /text + text font=info value expression=mod mode=soft / + newline/ + /if /item /content --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins view_favorites.py,1.1,1.2
Update of /cvsroot/freevo/freevo/src/tv/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23616/src/tv/plugins Modified Files: view_favorites.py Log Message: More favorites support... almost there! Index: view_favorites.py === RCS file: /cvsroot/freevo/freevo/src/tv/plugins/view_favorites.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** view_favorites.py 24 Feb 2004 04:40:16 - 1.1 --- view_favorites.py 13 Mar 2004 03:28:06 - 1.2 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.2 2004/03/13 03:28:06 rshortt + # More favorites support... almost there! + # # Revision 1.1 2004/02/24 04:40:16 rshortt # Make 'View Favorites' a menu based plugin, still incomplete. *** *** 43,46 --- 46,50 from item import Item from tv.program_display import FavoriteItem + from gui.AlertBox import AlertBox *** *** 70,73 --- 74,78 favorites.sort(f) for fav in favorites: + print 'FAV: name=%s mod=%s' % (fav.name, fav.mod) items.append(FavoriteItem(self, fav)) --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv program_display.py,1.32,1.33
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23616/src/tv
Modified Files:
program_display.py
Log Message:
More favorites support... almost there!
Index: program_display.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** program_display.py 24 Feb 2004 05:08:11 - 1.32
--- program_display.py 13 Mar 2004 03:28:06 - 1.33
***
*** 10,13
--- 10,16
#---
# $Log$
+ # Revision 1.33 2004/03/13 03:28:06 rshortt
+ # More favorites support... almost there!
+ #
# Revision 1.32 2004/02/24 05:08:11 rshortt
# Differentiate between name and title.
***
*** 64,68
from item import Item
! from gui.AlertBox import *
DEBUG = config.DEBUG
--- 67,72
from item import Item
! from gui.AlertBox import AlertBox
! from gui.InputBox import InputBox
DEBUG = config.DEBUG
***
*** 220,226
Item.__init__(self, parent, skin_type='video')
self.fav = fav
! self.name = fav.name
self.title = fav.title
if fav.channel == 'ANY':
self.channel = _('ANY CHANNEL')
--- 224,232
Item.__init__(self, parent, skin_type='video')
self.fav = fav
! self.name = self.origname = fav.name
self.title = fav.title
+ self.week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'),
_('Sat'), _('Sun'))
+
if fav.channel == 'ANY':
self.channel = _('ANY CHANNEL')
***
*** 230,235
self.dow = _('ANY DAY')
else:
! week_days = (_('Mon'), _('Tue'), _('Wed'), _('Thu'), _('Fri'), _('Sat'),
_('Sun'))
! self.dow = week_days[int(fav.dow)]
if fav.mod == 'ANY':
self.mod = _('ANY TIME')
--- 236,240
self.dow = _('ANY DAY')
else:
! self.dow = self.week_days[int(fav.dow)]
if fav.mod == 'ANY':
self.mod = _('ANY TIME')
***
*** 237,240
--- 242,248
self.mod = strftime(config.TV_TIMEFORMAT, gmtime(float(fav.mod * 60)))
+ # needed by the inputbox handler
+ self.menuw = None
+
def actions(self):
***
*** 257,261
action=self.mod_priority))
! items.append(menu.MenuItem(_('Save changes'), action=self.mod_time))
items.append(menu.MenuItem(_('Remove favorite'), action=self.rem_favorite))
--- 265,269
action=self.mod_priority))
! items.append(menu.MenuItem(_('Save changes'), action=self.save_changes))
items.append(menu.MenuItem(_('Remove favorite'), action=self.rem_favorite))
***
*** 268,288
def mod_name(self, arg=None, menuw=None):
! pass
def mod_channel(self, arg=None, menuw=None):
! pass
def mod_day(self, arg=None, menuw=None):
! pass
def mod_time(self, arg=None, menuw=None):
! pass
def rem_favorite(self, arg=None, menuw=None):
! (result, msg) = record_client.removeFavorite(self.fav.name)
if result:
# then menu back one which should show an updated list if we
--- 276,399
def mod_name(self, arg=None, menuw=None):
! self.menuw = menuw
! InputBox(text=_('Alter Name'), handler=self.alter_name).show()
!
!
! def alter_name(self, name):
! if name:
! self.name = self.fav.name = name
!
! self.menuw.refresh()
def mod_channel(self, arg=None, menuw=None):
! items = []
!
! items.append(menu.MenuItem('ANY CHANNEL', action=self.alter_prop,
! arg=('channel', 'ANY')))
!
! for chanline in config.TV_CHANNELS:
! items.append(menu.MenuItem(chanline[1], action=self.alter_prop,
! arg=('channel', chanline[1])))
!
! favorite_menu = menu.Menu(_('Modify Channel'), items,
! item_types = 'tv favorite menu')
! favorite_menu.infoitem = self
! menuw.pushmenu(favorite_menu)
! menuw.refresh()
!
!
! def alter_prop(self, arg=(None,None), menuw=None):
! (prop, val) = arg
! print 'FAV: prop=%s' % prop
! print 'FAV: val=%s' % val
!
! if prop == 'channel':
! if val == 'ANY':
! self.channel = 'ANY CHANNEL'
! self.fav.channel = 'ANY'
! else:
! self.channel = val
! self.fav.channel = val
!
! elif prop == 'dow':
! if val
[Freevo-cvslog] freevo/src/www/htdocs search.rpy,1.17,1.18
Update of /cvsroot/freevo/freevo/src/www/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22905/src/www/htdocs
Modified Files:
search.rpy
Log Message:
Fix selected tab.
Index: search.rpy
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/search.rpy,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** search.rpy 9 Mar 2004 00:14:35 - 1.17
--- search.rpy 10 Mar 2004 20:33:40 - 1.18
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.18 2004/03/10 20:33:40 rshortt
+ # Fix selected tab.
+ #
# Revision 1.17 2004/03/09 00:14:35 rshortt
# Add advanced search and link to search page. Next will probably add genre
***
*** 129,133
(server_available, message) = ri.connectionTest()
if not server_available:
! fv.printHeader(_('Search Results'), 'styles/main.css')
fv.res += 'h4'+_('ERROR')+': '+_('recording server is
unavailable')+'/h4'
fv.printAdvancedSearchForm()
--- 132,136
(server_available, message) = ri.connectionTest()
if not server_available:
! fv.printHeader(_('Search Results'), 'styles/main.css',
selected=_('Search'))
fv.res += 'h4'+_('ERROR')+': '+_('recording server is
unavailable')+'/h4'
fv.printAdvancedSearchForm()
***
*** 153,157
rec_progs = recordings.getProgramList()
! fv.printHeader(_('Search'), 'styles/main.css')
fv.res += 'br /br /'
--- 156,160
rec_progs = recordings.getProgramList()
! fv.printHeader(_('Search'), 'styles/main.css', selected=_('Search'))
fv.res += 'br /br /'
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/www web_types.py,1.23,1.24
Update of /cvsroot/freevo/freevo/src/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29497/src/www
Modified Files:
web_types.py
Log Message:
Add advanced search and link to search page. Next will probably add genre
options.
Index: web_types.py
===
RCS file: /cvsroot/freevo/freevo/src/www/web_types.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** web_types.py23 Feb 2004 08:31:55 - 1.23
--- web_types.py9 Mar 2004 00:14:35 - 1.24
***
*** 10,13
--- 10,17
# ---
# $Log$
+ # Revision 1.24 2004/03/09 00:14:35 rshortt
+ # Add advanced search and link to search page. Next will probably add genre
+ # options.
+ #
# Revision 1.23 2004/02/23 08:31:55 gsbarbieri
# Helper functions.
***
*** 178,181
--- 182,186
(_('Media Library'),_('View Media Library'),'%slibrary.rpy' %
str(strprefix)),
(_('Manual Recording'),_('Schedule a Manual
Recording'),'%smanualrecord.rpy' % str(strprefix)),
+ (_('Search'),_('Advanced Search Page'),'%ssearch.rpy' %
str(strprefix)),
(_('Help'),_('View Online Help and Documentation'),'%shelp/' %
str(strprefix))]
***
*** 275,279
self.res +=
form id=SearchForm action=search.rpy method=get
! div class=searchformb+_('Search')+:/binput type=text
name=find size=20//div
/form
--- 280,294
self.res +=
form id=SearchForm action=search.rpy method=get
! div class=searchformb+_('Search')+:/binput type=text
name=find size=20 //div
! /form
!
!
! def printAdvancedSearchForm(self):
! self.res +=
! form id=SearchForm action=search.rpy method=get
! div class=searchformb+_('Search')+:/binput type=text
name=find size=20 /
! input type=checkbox selected=0 name=movies_only /+_('Movies only')+
! input type=submit value= +_('Go!')+ /
! /div
/form
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/www/htdocs search.rpy,1.16,1.17
Update of /cvsroot/freevo/freevo/src/www/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29497/src/www/htdocs
Modified Files:
search.rpy
Log Message:
Add advanced search and link to search page. Next will probably add genre
options.
Index: search.rpy
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/search.rpy,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** search.rpy 23 Feb 2004 08:33:21 - 1.16
--- search.rpy 9 Mar 2004 00:14:35 - 1.17
***
*** 12,15
--- 12,19
# ---
# $Log$
+ # Revision 1.17 2004/03/09 00:14:35 rshortt
+ # Add advanced search and link to search page. Next will probably add genre
+ # options.
+ #
# Revision 1.16 2004/02/23 08:33:21 gsbarbieri
# i18n: help translators job.
***
*** 127,131
fv.printHeader(_('Search Results'), 'styles/main.css')
fv.res += 'h4'+_('ERROR')+': '+_('recording server is
unavailable')+'/h4'
! fv.printSearchForm()
fv.printLinks()
fv.printFooter()
--- 131,135
fv.printHeader(_('Search Results'), 'styles/main.css')
fv.res += 'h4'+_('ERROR')+': '+_('recording server is
unavailable')+'/h4'
! fv.printAdvancedSearchForm()
fv.printLinks()
fv.printFooter()
***
*** 134,139
find = fv.formValue(form, 'find')
! (got_matches, progs) = ri.findMatches(find)
if got_matches:
--- 138,149
find = fv.formValue(form, 'find')
+ if fv.formValue(form, 'movies_only'):
+ movies_only = 1
+ else:
+ movies_only = 0
! print 'DEBUG: movies_only=%s' % movies_only
!
! (got_matches, progs) = ri.findMatches(find, movies_only)
if got_matches:
***
*** 143,150
rec_progs = recordings.getProgramList()
! fv.printHeader(_('Search Results'), 'styles/main.css')
! if not got_matches:
! fv.res += 'h3'+_('No matches')+'/h3'
else:
--- 153,164
rec_progs = recordings.getProgramList()
! fv.printHeader(_('Search'), 'styles/main.css')
! fv.res += 'br /br /'
! fv.printAdvancedSearchForm()
!
! if not got_matches:
! if find or movies_only:
! fv.res += 'h3'+_('No matches')+'/h3'
else:
***
*** 208,212
fv.res += '/div'
! fv.printSearchForm()
fv.printLinks()
--- 222,226
fv.res += '/div'
! # fv.printSearchForm()
fv.printLinks()
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/www/htdocs genre.rpy,1.8,1.9
Update of /cvsroot/freevo/freevo/src/www/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15479/src/www/htdocs
Modified Files:
genre.rpy
Log Message:
Lets add in prog.desc to fill up some of this area.
Index: genre.rpy
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/genre.rpy,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** genre.rpy 23 Feb 2004 08:33:21 - 1.8
--- genre.rpy 5 Mar 2004 02:37:05 - 1.9
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.9 2004/03/05 02:37:05 rshortt
+ # Lets add in prog.desc to fill up some of this area.
+ #
# Revision 1.8 2004/02/23 08:33:21 gsbarbieri
# i18n: help translators job.
***
*** 258,262
)
! fv.tableCell(prog.title, 'class='+status+'
onclick=showPop(\'%s\', this) width=80%%' % popid )
fv.tableCell(time.strftime('%H:%M', time.localtime(prog.start)),
'class=channel')
fv.tableCell(time.strftime('%H:%M', time.localtime(prog.stop)),
'class=channel')
--- 261,265
)
! fv.tableCell(prog.title + 'nbsp;nbsp;-nbsp;nbsp;' +
prog.desc, 'class='+status+' onclick=showPop(\'%s\', this) width=80%%' % popid )
fv.tableCell(time.strftime('%H:%M', time.localtime(prog.start)),
'class=channel')
fv.tableCell(time.strftime('%H:%M', time.localtime(prog.stop)),
'class=channel')
---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.31,1.32
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17871/src/helpers Modified Files: recordserver.py Log Message: Make it work with rc.py changes. Index: recordserver.py === RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** recordserver.py 23 Feb 2004 21:46:22 - 1.31 --- recordserver.py 4 Mar 2004 05:10:54 - 1.32 *** *** 7,10 --- 7,13 # --- # $Log$ + # Revision 1.32 2004/03/04 05:10:54 rshortt + # Make it work with rc.py changes. + # # Revision 1.31 2004/02/23 21:46:22 dischi # start some unicode fixes, still not working every time *** *** 893,897 print 'RECORDSERVER HANDLING EVENT' ! event, event_repeat_count = rc_object.poll() if event: --- 896,900 print 'RECORDSERVER HANDLING EVENT' ! event = rc_object.poll() if event: --- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv program_display.py,1.29,1.30
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21157/src/tv
Modified Files:
program_display.py
Log Message:
More acurate handling of when to display schedule or remove options.
Index: program_display.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** program_display.py 23 Feb 2004 21:41:10 - 1.29
--- program_display.py 23 Feb 2004 23:34:10 - 1.30
***
*** 10,13
--- 10,16
#---
# $Log$
+ # Revision 1.30 2004/02/23 23:34:10 rshortt
+ # More acurate handling of when to display schedule or remove options.
+ #
# Revision 1.29 2004/02/23 21:41:10 dischi
# start some unicode fixes, still not working every time
***
*** 72,75
--- 75,79
else:
self.scheduled = False
+ self.favorite = False
self.start = time.strftime(config.TV_DATETIMEFORMAT,
***
*** 96,103
def display_program(self, arg=None, menuw=None):
items = []
! if self.context == 'schedule':
items.append(menu.MenuItem(_('Remove from schedule'),
action=self.remove_program))
! elif self.context == 'guide':
items.append(menu.MenuItem(_('Schedule for recording'),
action=self.schedule_program))
--- 100,115
def display_program(self, arg=None, menuw=None):
items = []
!
! (got_schedule, schedule) = record_client.getScheduledRecordings()
! if got_schedule:
! (result, message) = record_client.isProgScheduled(self.prog,
!
schedule.getProgramList())
! if result:
! self.scheduled = True
!
! if self.scheduled:
items.append(menu.MenuItem(_('Remove from schedule'),
action=self.remove_program))
! else:
items.append(menu.MenuItem(_('Schedule for recording'),
action=self.schedule_program))
***
*** 107,112
action=self.find_more))
! items.append(menu.MenuItem(_('Add to favorites'),
!action=self.add_favorite))
program_menu = menu.Menu(_('Program Menu'), items,
--- 119,134
action=self.find_more))
! (got_favs, favs) = record_client.getFavorites()
! if got_favs:
! (result, junk) = record_client.isProgAFavorite(self.prog, favs)
! if result:
! self.favorite = True
!
! if self.favorite:
! items.append(menu.MenuItem(_('Remove from favorites'),
!action=self.rem_favorite))
! else:
! items.append(menu.MenuItem(_('Add to favorites'),
!action=self.add_favorite))
program_menu = menu.Menu(_('Program Menu'), items,
***
*** 121,124
--- 143,150
+ def rem_favorite(self, arg=None, menuw=None):
+ pass
+
+
def find_more(self, arg=None, menuw=None):
# XXX: The searching part of this function could probably be moved
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv view_favorites.py,1.9,NONE
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13213/src/tv Removed Files: view_favorites.py Log Message: Remove popup-gui favorites in favour (ha! get it?) (no, really, do you?) of a menu based plugin. --- view_favorites.py DELETED --- --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main blurr2.fxd,1.49,1.50
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18446/share/skins/main Modified Files: blurr2.fxd Log Message: Begin work on an info area for favorites. Index: blurr2.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** blurr2.fxd 23 Feb 2004 19:58:55 - 1.49 --- blurr2.fxd 24 Feb 2004 05:08:49 - 1.50 *** *** 92,95 --- 92,99 /menu + menu type=tv favorite menu + style text=text with favorite info style/ + /menu + menuset label=video inherits=normal text style screen layout=video screen/ *** *** 145,148 --- 149,158 /menuset + menuset label=text with favorite info style inherits=text with info style + screen layout=tv screen visible=yes/ + info layout=tv favorite info x=50 y=100 width=700 height=100/ + view visible=no/ + /menuset + !-- ** -- *** *** 447,450 --- 457,477 /layout + layout label=tv favorite info + content x=0 y=0 type=text spacing=20 font=default + item type=default + if expression=name + text font=info value mode=softName: /text + text font=info value expression=name mode=soft / + newline/ + /if + if expression=title + text font=info value mode=softProgram: /text + text font=info value expression=title mode=soft / + newline/ + /if + /item + /content + /layout + !-- listing area for image with images (preview) -- --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/share/skins/main blurr2.fxd,1.47,1.48
Update of /cvsroot/freevo/freevo/share/skins/main In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4962/share/skins/main Modified Files: blurr2.fxd Log Message: Some skin deffinitions for a info area for ProgramItems. This could bennefit from beter layout. Index: blurr2.fxd === RCS file: /cvsroot/freevo/freevo/share/skins/main/blurr2.fxd,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** blurr2.fxd 21 Feb 2004 19:36:28 - 1.47 --- blurr2.fxd 23 Feb 2004 03:41:31 - 1.48 *** *** 88,91 --- 88,95 /menu + menu type=tv program menu + style text=text with program info style/ + /menu + menuset label=video inherits=normal text style screen layout=video screen/ *** *** 135,138 --- 139,148 /menuset + menuset label=text with program info style inherits=text with info style + screen layout=tv screen visible=yes/ + info layout=tv program info x=50 y=100 width=700 height=230/ + view visible=no/ + /menuset + !-- ** -- *** *** 390,393 --- 400,450 /layout + layout label=tv program info + content x=0 y=0 type=text spacing=20 font=default + item type=default + if expression=title + text font=info value mode=softTitle: /text + text font=info value expression=title mode=soft / + newline/ + /if + if expression=sub_title + text font=info value mode=softSub-Title: /text + text font=info value expression=sub_title mode=soft / + newline/ + /if + if expression=channel + text font=info value mode=softChannel: /text + text font=info value expression=channel mode=soft / + newline/ + /if + if expression=start + text font=info value mode=softStart: /text + text font=info value expression=start mode=soft / + newline/ + /if + if expression=stop + text font=info value mode=softStop: /text + text font=info value expression=stop mode=soft / + newline/ + /if + if expression=desc + text font=info value mode=softDescription: /text + text font=info value expression=desc mode=soft / + newline/ + /if + if expression=categories + text font=info value mode=softCategories: /text + text font=info value expression=categories mode=soft / + newline/ + /if + if expression=ratings + text font=info value mode=softRatings: /text + text font=info value expression=ratings mode=soft / + newline/ + /if + /item + /content + /layout + !-- listing area for image with images (preview) -- --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv program_display.py,1.26,1.27
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5304/src/tv
Modified Files:
program_display.py
Log Message:
Ditch the popup-gui style in favour of a faster and more freevo-like menu.
Index: program_display.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** program_display.py 19 Feb 2004 04:57:57 - 1.26
--- program_display.py 23 Feb 2004 03:43:23 - 1.27
***
*** 10,82
#---
# $Log$
! # Revision 1.26 2004/02/19 04:57:57 gsbarbieri
! # Support Web Interface i18n.
! # To use this, I need to get the gettext() translations in unicode, so some changes
are required to files that use print _('string'), need to make them print
String(_('string')).
! #
! # Revision 1.25 2004/02/18 21:55:11 dischi
! # update to new gui code
! #
! # Revision 1.24 2004/01/09 02:10:00 rshortt
! # Patch from Matthieu Weber to revive add/edit favorites support from the
! # TV interface.
! #
! # Revision 1.23 2003/11/28 20:08:58 dischi
! # renamed some config variables
! #
! # Revision 1.22 2003/11/15 17:24:31 dischi
! # i18n patches from Davin Sagnol
! #
! # Revision 1.21 2003/10/22 02:45:02 rshortt
! # Fix a crash when no recordserver is available.
! #
! # Revision 1.20 2003/10/21 15:11:52 outlyer
! # Remove a stray print... this was probably for debugging.
! #
! # Revision 1.19 2003/10/20 01:41:55 rshortt
! # Moving tv_util from src/tv/ to src/util/.
! #
! # Revision 1.18 2003/10/18 09:33:34 dischi
! # fix some parent handling and remove the PopupBox
! #
! # Revision 1.17 2003/10/14 17:06:02 dischi
! # add datetimeformat patch from patch from Eirik Meland
! #
! # Revision 1.16 2003/10/14 02:30:12 rshortt
! # Changes to make the list update when you remove a scheduled recording.
! #
! # Also made the buttons in the program display on top of one another instead
! # of side by side. I will be adding more buttons (add to favorites, search
! # for more) and they will look and fit better this way. I think they would
! # all be better together in a ListBox.
! #
! # Revision 1.15 2003/09/13 21:00:50 outlyer
! # OSDFont has 'name' as an attribute, while Font has 'filename' It was swapped
! # here, and was crashing.
! #
! # Revision 1.14 2003/09/11 14:10:20 outlyer
! # Fix a crash if you press up/down in certain 'record' screens.
! # Also, disable debug information by default; allow the global variable
! # to decide.
! #
! # Revision 1.13 2003/09/07 11:18:27 dischi
! # many optical improvements
! #
! # Revision 1.12 2003/09/06 19:54:04 rshortt
! # Don't crash if there's no description.
! #
! # Revision 1.11 2003/09/06 17:31:17 rshortt
! # Removed 'Description: ' and added a close button.
! #
! # Revision 1.10 2003/09/05 02:48:12 rshortt
! # Removing src/tv and src/www from PYTHONPATH in the freevo script.
! # Therefore any module that was imported from src/tv/ or src/www that
! # didn't have a leading 'tv.' or 'www.' needed it added. Also moved
! # tv/tv.py to tv/tvmenu.py to avoid namespace conflicts.
! #
! # Revision 1.9 2003/09/01 19:46:02 dischi
! # add menuw to eventhandler, it may be needed
#
- # Revision 1.8 2003/08/23 12:51:43 dischi
- # removed some old CVS log messages
#
#
--- 10,16
#---
# $Log$
! # Revision 1.27 2004/02/23 03:43:23 rshortt
! # Ditch the popup-gui style in favour of a faster and more freevo-like menu.
#
#
#
***
*** 103,118
# --
! import time
- import config, tv.edit_favorite
import util.tv_util as tv_util
import tv.record_client as record_client
- import tv.view_favorites, tv.program_search
import event as em
! from gui.GUIObject import *
! from gui.Borderimport *
! from gui.Label import *
! from gui.ListBox import *
from gui.AlertBox import *
--- 37,50
# --
! import time, traceback
!
! import plugin, config, menu
import util.tv_util as tv_util
import tv.record_client as record_client
import event as em
! from item import Item
! from gui.PopupBox import *
from gui.AlertBox import *
***
*** 120,435
! class ProgramDisplay(PopupBox):
!
! prog the program to record
! context guide or recording
! left x coordinate. Integer
! top y coordinate. Integer
! width Integer
! heightInteger
!
!
! def __init__(self, parent=None, prog=None, context=None, left=None,
! top=None, width=600, height=None, vertical_expansion=1):
!
! self.left = left
[Freevo-cvslog] freevo/src/tv/plugins scheduled_recordings.py,NONE,1.1
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5873/src/tv/plugins
Added Files:
scheduled_recordings.py
Log Message:
A plugin to view a list of scheduled recordings instead of hardcoding it
into tvmenu.py. This uses ProgramItem and blurr2 will present an info area
with details of the program in question.
plugin.activate('tv.scheduled_recordings')
--- NEW FILE: scheduled_recordings.py ---
#if 0 /*
# ---
# scheduled_recordings.py - A plugin to view your list of scheduled
# recordings.
# ---
# $Id: scheduled_recordings.py,v 1.1 2004/02/23 03:48:14 rshortt Exp $
#
# Notes:
# Todo:
#
# ---
# $Log: scheduled_recordings.py,v $
# Revision 1.1 2004/02/23 03:48:14 rshortt
# A plugin to view a list of scheduled recordings instead of hardcoding it
# into tvmenu.py. This uses ProgramItem and blurr2 will present an info area
# with details of the program in question.
#
# plugin.activate('tv.scheduled_recordings')
#
#
#
# ---
# Freevo - A Home Theater PC framework
# Copyright (C) 2003 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# --- */
#endif
import os
import config, plugin, menu, rc
import tv.record_client as record_client
from item import Item
from tv.program_display import ProgramItem
class ScheduledRecordingsItem(Item):
def __init__(self, parent):
Item.__init__(self, parent, skin_type='tv')
self.name = _('Scheduled Recordings')
def actions(self):
return [ ( self.display_schedule , 'Display Scheduled Recordings' ) ]
def display_schedule(self, arg=None, menuw=None):
items = []
(server_available, msg) = record_client.connectionTest()
if not server_available:
AlertBox(_('Record server unavailable: %s') % msg,
self, Align.CENTER).show()
return
(result, recordings) = record_client.getScheduledRecordings()
if result:
progs = recordings.getProgramList()
f = lambda a, b: cmp(a.start, b.start)
progs = progs.values()
progs.sort(f)
for prog in progs:
items.append(ProgramItem(self, prog, context='schedule'))
else:
AlertBox(_('Get recordings failed: %s') % recordings,
self, Align.CENTER).show()
return
schedule_menu = menu.Menu(_( 'Scheduled Recordings'), items,
item_types = 'tv program menu')
rc.app(None)
menuw.pushmenu(schedule_menu)
menuw.refresh()
class PluginInterface(plugin.MainMenuPlugin):
This plugin is used to display your currently scheduled recordings.
plugin.activate('tv.scheduled_recordings')
def __init__(self):
plugin.MainMenuPlugin.__init__(self)
def items(self, parent):
return [ ScheduledRecordingsItem(parent) ]
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv tvmenu.py,1.13,1.14
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6409/src/tv
Modified Files:
tvmenu.py
Log Message:
Remove scheduled recordings because it is now a plugin. Also comment out
view favorites because it is next as well as search because search is now
menu and item based, we just need a text input for the skin based UI.
View/Edit favorites and search will be plugins as well.
Index: tvmenu.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/tvmenu.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tvmenu.py 4 Feb 2004 14:11:18 - 1.13
--- tvmenu.py 23 Feb 2004 03:51:22 - 1.14
***
*** 10,13
--- 10,19
# ---
# $Log$
+ # Revision 1.14 2004/02/23 03:51:22 rshortt
+ # Remove scheduled recordings because it is now a plugin. Also comment out
+ # view favorites because it is next as well as search because search is now
+ # menu and item based, we just need a text input for the skin based UI.
+ # View/Edit favorites and search will be plugins as well.
+ #
# Revision 1.13 2004/02/04 14:11:18 outlyer
# Cleanup and fixup:
***
*** 74,78
from gui.PopupBox import PopupBox
! import tv.program_display, tv.program_search, tv.view_favorites
# Set to 1 for debug output
--- 80,85
from gui.PopupBox import PopupBox
! import tv.program_display
! # , tv.program_search, tv.view_favorites
# Set to 1 for debug output
***
*** 127,134
items.append(DirItem(config.TV_RECORD_DIR, None, name = _('Recorded Shows'),
display_type='tv'))
! items.append(menu.MenuItem(_('Scheduled Recordings'),
!action=self.view_schedule))
! items.append(menu.MenuItem(_('Search Guide'), action=self.show_search))
! items.append(menu.MenuItem('View Favorites', action=self.show_favorites))
plugins_list = plugin.get('mainmenu_tv')
--- 134,141
items.append(DirItem(config.TV_RECORD_DIR, None, name = _('Recorded Shows'),
display_type='tv'))
!
! # XXX: these are becomming plugins
! # items.append(menu.MenuItem(_('Search Guide'), action=self.show_search))
! # items.append(menu.MenuItem('View Favorites', action=self.show_favorites))
plugins_list = plugin.get('mainmenu_tv')
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv tvguide.py,1.24,1.25
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6995/src/tv
Modified Files:
tvguide.py
Log Message:
Use ProgramItem and display_program rather than clunky popup-gui. Because
of this the tvguide does no longer need to extend GUIObject. For now it
needs to extend Item unless we make each program block into a distinctive
ProgramItem which may unnesseccarily increase overhead.
Index: tvguide.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/tvguide.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** tvguide.py 16 Feb 2004 18:10:54 - 1.24
--- tvguide.py 23 Feb 2004 03:54:25 - 1.25
***
*** 10,13
--- 10,19
# ---
# $Log$
+ # Revision 1.25 2004/02/23 03:54:25 rshortt
+ # Use ProgramItem and display_program rather than clunky popup-gui. Because
+ # of this the tvguide does no longer need to extend GUIObject. For now it
+ # needs to extend Item unless we make each program block into a distinctive
+ # ProgramItem which may unnesseccarily increase overhead.
+ #
# Revision 1.24 2004/02/16 18:10:54 outlyer
# Patch from James A. Laska to make the TV Guide behave intuitively when
***
*** 91,95
import epg_xmltv, epg_types
! import program_display
import record_client as ri
--- 97,102
import epg_xmltv, epg_types
! from item import Item
! from program_display import ProgramItem
import record_client as ri
***
*** 99,105
CHAN_NO_DATA = _('This channel has no data loaded')
! class TVGuide(gui.GUIObject):
def __init__(self, start_time, player, menuw):
! gui.GUIObject.__init__(self)
self.n_items, hours_per_page = skin.items_per_page(('tv', self))
--- 106,112
CHAN_NO_DATA = _('This channel has no data loaded')
! class TVGuide(Item):
def __init__(self, start_time, player, menuw):
! Item.__init__(self)
self.n_items, hours_per_page = skin.items_per_page(('tv', self))
***
*** 124,127
--- 131,135
self.type = 'tv'
self.menuw = menuw
+ self.visible = True
self.update_schedules(force=True)
***
*** 209,213
self.menuw.refresh()
- #elif event == em.MENU_SUBMENU or event == em.TV_START_RECORDING:
elif event == em.MENU_SUBMENU:
--- 217,220
***
*** 352,361
pass
def event_RECORD(self):
if self.selected.scheduled:
! program_display.ProgramDisplay(parent=self, context='recording',
! prog=self.selected).show()
else:
! program_display.ProgramDisplay(parent=self, prog=self.selected).show()
def event_RIGHT(self):
start_time= self.start_time
--- 359,371
pass
+
def event_RECORD(self):
if self.selected.scheduled:
! pi = ProgramItem(self, prog=self.selected, context='schedule')
else:
! pi = ProgramItem(self, prog=self.selected, context='guide')
! pi.display_program(menuw=self.menuw)
!
!
def event_RIGHT(self):
start_time= self.start_time
***
*** 401,405
self.rebuild(start_time, stop_time, start_channel, prg)
-
--- 411,414
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/www/htdocs/scripts display_prog-head.js,1.2,1.3
Update of /cvsroot/freevo/freevo/src/www/htdocs/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6281/src/www/htdocs/scripts
Modified Files:
display_prog-head.js
Log Message:
Fix for proginfo popup location.
Index: display_prog-head.js
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/scripts/display_prog-head.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** display_prog-head.js20 May 2003 16:22:06 - 1.2
--- display_prog-head.js16 Feb 2004 04:23:54 - 1.3
***
*** 18,22
function showPop(pop, cell) {
pop = document.getElementById(pop);
! pop.style.top = popY-100;
pop.style.visibility = 'visible';
}
--- 18,22
function showPop(pop, cell) {
pop = document.getElementById(pop);
! pop.style.top = (popY-100) + px;
pop.style.visibility = 'visible';
}
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src pyui_renderer.py,NONE,1.1 osd.py,1.135,1.135.2.1 main.py,1.112,1.112.2.1 rc.py,1.28,1.28.2.1
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2408
Modified Files:
Tag: pyui_test
osd.py main.py rc.py
Added Files:
pyui_renderer.py
Log Message:
Testing of PyUI on a branch tag (pyui_test). The OSD object is part of the
renderer here and the main loop is modified to use pyui.
For more on pyui: http://pyui.sf.net
--- NEW FILE: pyui_renderer.py ---
#if 0 /*
# -*- coding: iso-8859-1 -*-
# ---
# osd.py - Low level graphics routines
# ---
# $Id: pyui_renderer.py,v 1.1 2004/02/10 00:33:56 rshortt Exp $
#
# Notes:
# Todo:
#
# ---
# $Log: pyui_renderer.py,v $
# Revision 1.1 2004/02/10 00:33:56 rshortt
# Testing of PyUI on a branch tag (pyui_test). The OSD object is part of the
# renderer here and the main loop is modified to use pyui.
#
# For more on pyui: http://pyui.sf.net
#
#
[...1652 lines suppressed...]
# print 'DEBUG: FreevoDesktop::update()'
# process user events
while self.running and self.userEvents:
e = self.userEvents.pop(0)
self.handleEvent(e)
if not self.running:
return self.running
# process timer callbacks
timer = self.renderer.readTimer()
for callback in self.callbacks.keys():
if callback.process(timer):
del self.callbacks[callback]
return self.running
Index: osd.py
===
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.135
retrieving revision 1.135.2.1
diff -C2 -d -r1.135 -r1.135.2.1
*** osd.py 7 Feb 2004 11:50:57 - 1.135
--- osd.py 10 Feb 2004 00:33:56 - 1.135.2.1
***
*** 11,38
# ---
# $Log$
! # Revision 1.135 2004/02/07 11:50:57 dischi
! # fix geometry calculation for border fonts
! #
! # Revision 1.134 2004/02/06 18:24:39 dischi
! # make to possible to override busy icon with skin
! #
! # Revision 1.133 2004/02/05 19:26:41 dischi
! # fix unicode handling
[...1249 lines suppressed...]
- col += 1
-
- self.update()
- else:
- _debug_('Help off')
- self.screen.blit(self._help_saved, (0, 0))
- self.update()
-
-
- # Convert a 32-bit TRGB color to a 4 element tuple for SDL
- def _sdlcol(self, col):
- if col==None:
- return (0,0,0,255)
- a = 255 - ((col 24) 0xff)
- r = (col 16) 0xff
- g = (col 8) 0xff
- b = (col 0) 0xff
- c = (r, g, b, a)
- return c
--- 192,193
Index: main.py
===
RCS file: /cvsroot/freevo/freevo/src/main.py,v
retrieving revision 1.112
retrieving revision 1.112.2.1
diff -C2 -d -r1.112 -r1.112.2.1
*** main.py 5 Feb 2004 20:39:11 - 1.112
--- main.py 10 Feb 2004 00:33:56 - 1.112.2.1
***
*** 11,14
--- 11,20
# ---
# $Log$
+ # Revision 1.112.2.1 2004/02/10 00:33:56 rshortt
+ # Testing of PyUI on a branch tag (pyui_test). The OSD object is part of the
+ # renderer here and the main loop is modified to use pyui.
+ #
+ # For more on pyui: http://pyui.sf.net
+ #
# Revision 1.112 2004/02/05 20:39:11 dischi
# check mmpython cache version
***
*** 72,75
--- 78,83
import signal
+ import pyui
+
# i18n support
***
*** 360,363
--- 368,393
signal.signal(signal.SIGINT, signal_handler)
+ # from pydfb_renderer import DirectFB
+ # renderer = DirectFB()
+
+ from pyui_renderer import FreevoDesktop
+
+ #from pyui.themes import future
+ #theme = future.FutureTheme(osd)
+
+ #from pyui.themes import green
+ #theme = green.GreenTheme(osd)
+
+ #from pyui.themes import comic
+ #theme = comic.ComicTheme(osd)
+
+ from pyui.themes import win2k
+ theme = win2k.Win2kTheme(osd)
+
+ desktop = FreevoDesktop(osd, osd.width, osd.height, osd.fullscreen, theme)
+
+ # pyui.init(renderer=osd)
+ pyui.init(desktop=desktop)
+
# load the fxditem to make sure it's the first in the
# mimetypes list
***
*** 404,497
MainMenu().getcmd()
! poll_plugins = plugin.get('daemon_poll')
! eventhandler_plugins = []
! eventlistener_plugins = []
!
! for p in plugin.get('daemon_eventhandler'):
! if hasattr(p, 'event_listener') and p.event_listener:
! eventlistener_plugins.append(p)
! else:
! eventhandler_plugins.append(p
[Freevo-cvslog] freevo freevo,1.109,1.110
Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31421
Modified Files:
freevo
Log Message:
Use env from /usr/bin rather than /bin. I beleive it is standard in /usr/bin,
looking in /bin breaks Debian and others while it is available in both places
(so I have been told) in RedHat and Gentoo.
Also standardize the naming of pid files.
Index: freevo
===
RCS file: /cvsroot/freevo/freevo/freevo,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** freevo 6 Feb 2004 18:01:21 - 1.109
--- freevo 10 Feb 2004 00:17:52 - 1.110
***
*** 1,3
! #!/bin/env python
#if 0 /*
--- 1,3
! #!/usr/bin/env python
#if 0 /*
***
*** 12,15
--- 12,22
# ---
# $Log$
+ # Revision 1.110 2004/02/10 00:17:52 rshortt
+ # Use env from /usr/bin rather than /bin. I beleive it is standard in /usr/bin,
+ # looking in /bin breaks Debian and others while it is available in both places
+ # (so I have been told) in RedHat and Gentoo.
+ #
+ # Also standardize the naming of pid files.
+ #
# Revision 1.109 2004/02/06 18:01:21 dischi
# fix bug with helper softlinks
***
*** 168,172
get pid of running 'name'
! for fname in ('/var/run/' + name, '/tmp/' + name + '%s-.pid' % os.getuid()):
if os.path.isfile(fname):
f = open(fname)
--- 175,180
get pid of running 'name'
! for fname in ('/var/run/' + name + '-%s.pid' % os.getuid(),
! '/tmp/' + name + '-%s.pid' % os.getuid()):
if os.path.isfile(fname):
f = open(fname)
***
*** 232,238
if store:
try:
! f = open('/var/run/' + name, 'w')
except (OSError, IOError):
! f = open('/tmp/' + name + '%s-.pid' % os.getuid(), 'w')
f.write(str(uid)+'\n')
--- 240,246
if store:
try:
! f = open('/var/run/' + name + '-%s.pid' % os.getuid(), 'w')
except (OSError, IOError):
! f = open('/tmp/' + name + '-%s.pid' % os.getuid(), 'w')
f.write(str(uid)+'\n')
---
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/RobShortt aim.py,1.1,1.2
Update of /cvsroot/freevo/freevo/WIP/RobShortt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32065/WIP/RobShortt Modified Files: aim.py Log Message: Comment. Index: aim.py === RCS file: /cvsroot/freevo/freevo/WIP/RobShortt/aim.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** aim.py 15 Jan 2004 01:36:15 - 1.1 --- aim.py 10 Feb 2004 00:18:53 - 1.2 *** *** 7,11 # # Notes: ! # This plugin requires the toc module from http://www.jamwt.com/Py-TOC/ # # config requirements: --- 7,12 # # Notes: ! # This plugin requires the toc module from http://www.jamwt.com/Py-TOC/ and ! # you can signup for an AIM account at http://register.oscar.aol.com/create # # config requirements: *** *** 35,38 --- 36,42 # --- # $Log$ + # Revision 1.2 2004/02/10 00:18:53 rshortt + # Comment. + # # Revision 1.1 2004/01/15 01:36:15 rshortt # TADA! Ok, so call me crazy. We could do some cool things with this, ideas --- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src pyui_renderer.py,1.1,1.2
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30508/src Modified Files: pyui_renderer.py Log Message: Bugifx from a bad merge of osd changes or this could also be a bug in osd.py. Index: pyui_renderer.py === RCS file: /cvsroot/freevo/freevo/src/pyui_renderer.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pyui_renderer.py10 Feb 2004 00:33:56 - 1.1 --- pyui_renderer.py10 Feb 2004 03:03:21 - 1.2 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.2 2004/02/10 03:03:21 rshortt + # Bugifx from a bad merge of osd changes or this could also be a bug in osd.py. + # # Revision 1.1 2004/02/10 00:33:56 rshortt # Testing of PyUI on a branch tag (pyui_test). The OSD object is part of the *** *** 1094,1097 --- 1097,1101 layer = self.screen + if layer: fgcolor = self._sdlcol(fgcolor) if border_color != None: --- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.315,1.316
Update of /cvsroot/freevo/freevo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv325 Modified Files: freevo_config.py Log Message: Duplicate MPLAYER_ARGS ivtv :P Index: freevo_config.py === RCS file: /cvsroot/freevo/freevo/freevo_config.py,v retrieving revision 1.315 retrieving revision 1.316 diff -C2 -d -r1.315 -r1.316 *** freevo_config.py4 Feb 2004 14:12:13 - 1.315 --- freevo_config.py4 Feb 2004 14:44:00 - 1.316 *** *** 910,914 'rmvb' : '-cache 5000 -forceidx', 'webcam' : 'tv:// -tv driver=v4l:width=352:height=288:outfmt=yuy2:device=/dev/video2', - 'ivtv' : '-cache 1024', 'default': '-cache 5000' } --- 910,913 --- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/RobShortt aim.py,NONE,1.1
Update of /cvsroot/freevo/freevo/WIP/RobShortt
In directory sc8-pr-cvs1:/tmp/cvs-serv26672
Added Files:
aim.py
Log Message:
TADA! Ok, so call me crazy. We could do some cool things with this, ideas
are welcome.
--- NEW FILE: aim.py ---
#if 0 /*
# ---
# aim.py -
# ---
# $Id: aim.py,v 1.1 2004/01/15 01:36:15 rshortt Exp $
#
# Notes:
# This plugin requires the toc module from http://www.jamwt.com/Py-TOC/
#
# config requirements:
# AIM_SCREENNAME = 'your_aim_login'
# AIM_PASSWORD = 'your_aim_password'
# AIM_NOTIFY = 'a_screenname_to_notify_of_events'
#
# Please remember that AIM doesn't support multiple logins of a single
# screen name so you may wish to create a new one for your Freevo.
# If config.AIM_NOTIFY is set then you may receive notifications of
# events or reminders of things like your favorite show starting.
#
# If you have any more ideas of uses for this plugin please speak up!
#
# Todo:
# - Get this thing to send you a notification X minutes before a recording
# starts. This should be easy, just ask the recordserver and remember
# if we already sent a notify for that program.
#
# - We could handle incomming messages by posting an OSD_MESSAGE event
# or creating a special popup.
#
# - We could respond to incomming messages by having the user choose from
# a predefined list of responses like I am watching a movie, go away,
# Email me, Call me, I'll get ahold of you later, etc.
#
# ---
# $Log: aim.py,v $
# Revision 1.1 2004/01/15 01:36:15 rshortt
# TADA! Ok, so call me crazy. We could do some cool things with this, ideas
# are welcome.
#
#
#
# ---
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# --- */
#endif
import time, re, string
from toc import TocTalk, BotManager
import config, plugin
from event import *
class IM:
def __init__(self, destination, message):
self.destination = destination
self.message = message
class FreevoAIM(TocTalk):
def __init__(self, screenname, password):
TocTalk.__init__(self, screenname, password)
def on_IM_IN(self, data):
sn,dc,msg = data.split(:, 2)
sn = self.normalize(sn)
msg = self.strip_html(msg)
print 'Got an IM from %s: %s' % (sn, msg)
class PluginInterface(plugin.DaemonPlugin):
def __init__(self):
init the osd
plugin.DaemonPlugin.__init__(self)
self.plugin_name = 'AIM'
bm = BotManager()
self.bot = FreevoAIM(config.AIM_SCREENNAME, config.AIM_PASSWORD)
# self.bot._debug = 0
bm.addBot(self.bot, bot)
time.sleep(4) # time to login
self.poll_interval = 100
self.visible = False
self.poll_menu_only = False
self.outgoing_list = []
def poll(self):
# print 'DEBUG: %s being polled' % self.plugin_name
if len(self.outgoing_list):
im = self.outgoing_list[0]
self.send_IM(im)
self.outgoing_list.remove(im)
def send_IM(self, im):
if not im.destination:
return
if not im.message:
return
self.bot.do_SEND_IM(im.destination, im.message)
def eventhandler(self, event, menuw=None):
Do something when receiving an event
_debug_('%s: %s app got %s event' % (time.time(), self.plugin_name, event))
if event == OSD_MESSAGE :
# XXX: This is just for debugging purposes.
self.outgoing_list.append(IM(config.AIM_NOTIFY, event.arg))
---
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50
[Freevo-cvslog] freevo/src item.py,1.44,1.45
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1:/tmp/cvs-serv11314/src Modified Files: item.py Log Message: Bugfix for outicons. Index: item.py === RCS file: /cvsroot/freevo/freevo/src/item.py,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** item.py 7 Jan 2004 18:13:25 - 1.44 --- item.py 8 Jan 2004 17:03:31 - 1.45 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.45 2004/01/08 17:03:31 rshortt + # Bugfix for outicons. + # # Revision 1.44 2004/01/07 18:13:25 dischi # respect overlay files and create dir if needed *** *** 217,221 self.icon = os.path.join(settings.icon_dir, skin_info.icon) if skin_info.outicon: ! self.outicon = os.path.join(settings.icon_dir, skin_info.icon) --- 220,224 self.icon = os.path.join(settings.icon_dir, skin_info.icon) if skin_info.outicon: ! self.outicon = os.path.join(settings.icon_dir, skin_info.outicon) --- This SF.net email is sponsored by: Perforce Software. Perforce is the Fast Software Configuration Management System offering advanced branching capabilities and atomic changes on 50+ platforms. Free Eval! http://www.perforce.com/perforce/loadprog.html ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv record_client.py,1.11,1.12
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv32257/tv
Modified Files:
record_client.py
Log Message:
Marmalade name and title for favorites. Thanks Matthieu Weber.
Index: record_client.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/record_client.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** record_client.py30 Nov 2003 16:30:58 - 1.11
--- record_client.py9 Jan 2004 02:07:05 - 1.12
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.12 2004/01/09 02:07:05 rshortt
+ # Marmalade name and title for favorites. Thanks Matthieu Weber.
+ #
# Revision 1.11 2003/11/30 16:30:58 rshortt
# Convert some tv variables to new format (TV_).
***
*** 185,189
def addEditedFavorite(name, title, chan, dow, mod, priority):
try:
! (status, message) = server.addEditedFavorite(name, title, chan, dow, mod,
priority)
except:
return (FALSE, _('record_client: connection error'))
--- 188,194
def addEditedFavorite(name, title, chan, dow, mod, priority):
try:
! (status, message) = \
! server.addEditedFavorite(marmalade.jellyToXML(name), \
! marmalade.jellyToXML(title), chan, dow, mod, priority)
except:
return (FALSE, _('record_client: connection error'))
---
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.21,1.22
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1:/tmp/cvs-serv32257/helpers Modified Files: recordserver.py Log Message: Marmalade name and title for favorites. Thanks Matthieu Weber. Index: recordserver.py === RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** recordserver.py 8 Jan 2004 17:38:59 - 1.21 --- recordserver.py 9 Jan 2004 02:07:05 - 1.22 *** *** 7,10 --- 7,13 # --- # $Log$ + # Revision 1.22 2004/01/09 02:07:05 rshortt + # Marmalade name and title for favorites. Thanks Matthieu Weber. + # # Revision 1.21 2004/01/08 17:38:59 outlyer # Write an FXD file with some of the XMLTV info for recorded programs. I just *** *** 728,732 def xmlrpc_addEditedFavorite(self, name, title, chan, dow, mod, priority): ! (status, response) = self.addEditedFavorite(name, title, chan, dow, mod, priority) return (status, 'RecordServer::addEditedFavorite: %s' % response) --- 731,737 def xmlrpc_addEditedFavorite(self, name, title, chan, dow, mod, priority): ! (status, response) = \ ! self.addEditedFavorite(marmalade.unjellyFromXML(name), \ ! marmalade.unjellyFromXML(title), chan, dow, mod, priority) return (status, 'RecordServer::addEditedFavorite: %s' % response) --- This SF.net email is sponsored by: Perforce Software. Perforce is the Fast Software Configuration Management System offering advanced branching capabilities and atomic changes on 50+ platforms. Free Eval! http://www.perforce.com/perforce/loadprog.html ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/gui Button.py,1.16,1.17 Label.py,1.22,1.23 LetterBox.py,1.13,1.14
Update of /cvsroot/freevo/freevo/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv32390/gui
Modified Files:
Button.py Label.py LetterBox.py
Log Message:
GUI fixes from Matthieu Weber.
Index: Button.py
===
RCS file: /cvsroot/freevo/freevo/src/gui/Button.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Button.py 12 Oct 2003 10:56:19 - 1.16
--- Button.py 9 Jan 2004 02:08:07 - 1.17
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.17 2004/01/09 02:08:07 rshortt
+ # GUI fixes from Matthieu Weber.
+ #
# Revision 1.16 2003/10/12 10:56:19 dischi
# change debug to use _debug_ and set level to 2
***
*** 223,227
if not self.label:
! self.label = Label()
self.label.set_text(text)
self.label.set_background_color(None)
--- 226,236
if not self.label:
! self.label = Label(h_align = Align.CENTER, v_align = Align.CENTER,
!text_prop = {
! 'align_h': 'center',
! 'align_v': 'center',
! 'mode': 'hard',
!}
! )
self.label.set_text(text)
self.label.set_background_color(None)
***
*** 230,235
self.label.set_text(text)
! self.label.set_v_align(Align.CENTER)
! self.label.set_h_align(Align.CENTER)
self.surface_changed = 1
--- 239,244
self.label.set_text(text)
! #self.label.set_v_align(Align.CENTER)
! #self.label.set_h_align(Align.CENTER)
self.surface_changed = 1
Index: Label.py
===
RCS file: /cvsroot/freevo/freevo/src/gui/Label.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Label.py12 Oct 2003 10:56:19 - 1.22
--- Label.py9 Jan 2004 02:08:07 - 1.23
***
*** 10,13
--- 10,16
#---
# $Log$
+ # Revision 1.23 2004/01/09 02:08:07 rshortt
+ # GUI fixes from Matthieu Weber.
+ #
# Revision 1.22 2003/10/12 10:56:19 dischi
# change debug to use _debug_ and set level to 2
***
*** 224,229
raise TypeError, type(text)
! # self.width = -1
! # self.height = -1
self.surface_changed = 1
--- 227,232
raise TypeError, type(text)
! self.width = -1
! self.height = -1
self.surface_changed = 1
Index: LetterBox.py
===
RCS file: /cvsroot/freevo/freevo/src/gui/LetterBox.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** LetterBox.py12 Oct 2003 10:56:19 - 1.13
--- LetterBox.py9 Jan 2004 02:08:07 - 1.14
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.14 2004/01/09 02:08:07 rshortt
+ # GUI fixes from Matthieu Weber.
+ #
# Revision 1.13 2003/10/12 10:56:19 dischi
# change debug to use _debug_ and set level to 2
***
*** 143,146
--- 146,151
self.set_v_align(Align.BOTTOM)
self.set_h_align(Align.CENTER)
+ self.label.set_v_align(Align.CENTER)
+ self.label.set_h_align(Align.CENTER)
***
*** 150,153
--- 155,160
self.label.width = self.width
self.label.height = self.height
+ self.label.set_v_align(Align.CENTER)
+ self.label.set_h_align(Align.CENTER)
***
*** 162,166
# XXX: should not have to draw here but it fixes an align problem.
! self.draw()
--- 169,173
# XXX: should not have to draw here but it fixes an align problem.
! #self.draw()
***
*** 175,179
# XXX: should not have to draw here but it fixes an align problem.
! self.draw()
--- 182,186
# XXX: should not have to draw here but it fixes an align problem.
! #self.draw()
---
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
___
Freevo-cvslog mailing list
[EMAIL PROTECTED
[Freevo-cvslog] freevo/src/tv edit_favorite.py,1.5,1.6 program_display.py,1.23,1.24 record_types.py,1.6,1.7 tvguide.py,1.21,1.22 tvmenu.py,1.10,1.11 view_favorites.py,1.5,1.6
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv32590/tv
Modified Files:
edit_favorite.py program_display.py record_types.py tvguide.py
tvmenu.py view_favorites.py
Log Message:
Patch from Matthieu Weber to revive add/edit favorites support from the
TV interface.
Index: edit_favorite.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/edit_favorite.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** edit_favorite.py16 Nov 2003 17:38:48 - 1.5
--- edit_favorite.py9 Jan 2004 02:10:00 - 1.6
***
*** 10,13
--- 10,17
#---
# $Log$
+ # Revision 1.6 2004/01/09 02:10:00 rshortt
+ # Patch from Matthieu Weber to revive add/edit favorites support from the
+ # TV interface.
+ #
# Revision 1.5 2003/11/16 17:38:48 dischi
# i18n patch from David Sagnol
***
*** 45,49
# --
! import time
import config, tv.epg_xmltv, tv.view_favorites
--- 49,53
# --
! from time import gmtime, strftime
import config, tv.epg_xmltv, tv.view_favorites
***
*** 54,57
--- 58,62
import tv.record_types
from tv.epg_types import TvProgram
+ from tv.view_favorites import ViewFavorites
from gui.GUIObject import *
***
*** 61,64
--- 66,70
from gui.OptionBox import *
from gui.LetterBoxGroup import *
+ from gui.ConfirmBox import ConfirmBox
DEBUG = 1
***
*** 74,86
width Integer
heightInteger
def __init__(self, parent=None, subject=None, left=None, top=None, width=500,
! height=350):
self.oldname = None
! print 'DEBUG::subject: %s' % dir(subject)
! print 'DEBUG::subject::__module__ %s' % subject.__module__
#if isinstance(subject, tv.record_types.Favorite):
#print 'DEBUG::subject: FUCK'
--- 80,97
width Integer
heightInteger
+ context Context in which the object is instanciated
def __init__(self, parent=None, subject=None, left=None, top=None, width=500,
! height=350, context=None):
self.oldname = None
+ if context:
+ self.context = context
+ else:
+ context = 'guide'
! #print 'DEBUG::subject: %s' % dir(subject)
! #print 'DEBUG::subject::__module__ %s' % subject.__module__
#if isinstance(subject, tv.record_types.Favorite):
#print 'DEBUG::subject: FUCK'
***
*** 117,121
guide = tv.epg_xmltv.get_guide()
! name = Label(_('Name:\t'), self, Align.LEFT)
self.name_input = LetterBoxGroup(text=self.fav.name)
self.name_input.h_align = Align.NONE
--- 128,132
guide = tv.epg_xmltv.get_guide()
! name = Label(_('Name:'), self, Align.LEFT)
self.name_input = LetterBoxGroup(text=self.fav.name)
self.name_input.h_align = Align.NONE
***
*** 123,129
! title = Label(_('Title:\t%s') % self.fav.title, self, Align.LEFT)
! chan = Label(_('Channel:\t'), self, Align.LEFT)
self.chan_box = OptionBox('ANY')
--- 134,140
! title = Label(_('Title:%s') % self.fav.title, self, Align.LEFT)
! chan = Label(_('Channel:'), self, Align.LEFT)
self.chan_box = OptionBox('ANY')
***
*** 131,224
self.chan_box.add_item(text='ANY', value='ANY')
! i = 0
chan_index = 0
for ch in guide.chan_list:
! if ch.id == self.fav.channel_id:
chan_index = i
i += 1
! self.chan_box.add_item(text=ch.id, value=ch.id)
self.chan_box.toggle_selected_index(chan_index)
self.add_child(self.chan_box)
! dow = Label(_('Day of Week:\t'), self, Align.LEFT)
self.dow_box = OptionBox('ANY DAY')
self.dow_box.h_align = Align.NONE
self.dow_box.add_item(text=_('ANY DAY'), value='ANY')
- self.dow_box.add_item(text=_('Mon'), value=0)
- self.dow_box.add_item(text=_('Tues'), value=1)
- self.dow_box.add_item(text=_('Wed'), value=2)
- self.dow_box.add_item(text=_('Thurs'), value=3)
- self.dow_box.add_item(text=_('Fri'), value=4)
- self.dow_box.add_item(text=_('Sat'), value=5)
- self.dow_box.add_item(text=_('Sun'), value=6)
! self.dow_box.toggle_selected_index(0)
self.add_child(self.dow_box)
! tod = Label(_('Time of Day:\t'), self, Align.LEFT)
self.tod_box = OptionBox('ANY
[Freevo-cvslog] freevo/src/plugins tiny_xosd.py,NONE,1.1
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv2224
Added Files:
tiny_xosd.py
Log Message:
An osd plugin by Cyril Lacoux that uses pyosd and therefore libxosd.
This will display over Freevo and child applications while running in X.
--- NEW FILE: tiny_xosd.py ---
#if 0 /*
# ---
# tiny_xosd.py - Implementation of an OSD function using PyOSD
# ---
# $Id: tiny_xosd.py,v 1.1 2004/01/07 02:03:10 rshortt Exp $
#
# Notes:
# Todo:
#
# ---
# $Log: tiny_xosd.py,v $
# Revision 1.1 2004/01/07 02:03:10 rshortt
# An osd plugin by Cyril Lacoux that uses pyosd and therefore libxosd.
# This will display over Freevo and child applications while running in X.
#
#
#
# ---
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# --- */
#endif
Plugin for PyOSDd which facilitates controling Freevo
import time, re, string, pyosd
import config, plugin
from event import *
OSD_MESSAGE_FONT= '-*-helvetica-medium-r-normal-*-*-260-*-*-p-*-*-*'
OSD_MESSAGE_COLOR = '#D3D3D3' # LightGray
OSD_MESSAGE_TIMEOUT = 3 # 3 seconds
OSD_MESSAGE_OFFSET = 20 + config.OSD_OVERSCAN_Y # Offset of 20 pixels
# Labels which are displayed with percent
PERCENT = [ 'Volume',
'Volume - unmuted',
'Bass',
'Treble',
'Synth',
'Pcm',
'Speaker',
'Line',
'Microphone',
'CD',
'Mix',
'Pcm 2',
'Record',
'Input Gain',
'Output Gain',
'Line 1',
'Line 2',
'Line 3',
'Digital 1',
'Digital 2',
'Digital 3',
'Phone In',
'Phone Out',
'Video',
'Radio',
'Monitor' ]
# Labels which are displayed with Slider
SLIDER = [ 'Balance',
'Volume - muted' ]
class PluginInterface(plugin.DaemonPlugin):
Xosd plugin.
This plugin shows messages sent from other parts of Freevo on
the screen for 3 seconds.
This is a replacement for tiny_osd which works with PyOSD (XOsd)
activate with :
plugin.remove('tiny_osd')
plugin.activate('tiny_xosd')
def __init__(self):
init the osd
plugin.DaemonPlugin.__init__(self)
self.plugin_name = 'OSD_MESSAGE'
# Initializing the screen
self.osd = pyosd.osd()
self.osd.set_font(OSD_MESSAGE_FONT)
self.osd.set_colour(OSD_MESSAGE_COLOR)
self.osd.set_timeout(OSD_MESSAGE_TIMEOUT)
self.osd.set_offset(OSD_MESSAGE_OFFSET)
self.message = ''
# (0%) - (100%)
self.re_percent = re.compile(r' [0-9][0-9]?[0-9]?%')
def draw_osd(self):
Display a message on the screen.
if not self.message == '' :
re_percent = self.re_percent.search(self.message)
if re_percent :
# A percentage was sent
label = self.message[0:re_percent.start() - 1]
percent = int(self.message[re_percent.start() + 1:re_percent.end() -
1])
if label in SLIDER :
type = pyosd.TYPE_SLIDER
else :
type = pyosd.TYPE_PERCENT
if percent 0 :
percent = 0
elif percent 100 :
percent = 100
# Display it on the bottom of the screen
self.osd.set_pos(pyosd.POS_BOT)
# First line is the label with the value
self.osd.display('%s (%d%%)' % (_(label), percent), pyosd.TYPE_STRING,
line=0)
# Second line is the progress bar
self.osd.display(percent, type, line=1)
else
[Freevo-cvslog] freevo freevo_config.py,1.307,1.308
Update of /cvsroot/freevo/freevo In directory sc8-pr-cvs1:/tmp/cvs-serv10970 Modified Files: freevo_config.py Log Message: Add --hide-gui to default XINE_COMMAND. Index: freevo_config.py === RCS file: /cvsroot/freevo/freevo/freevo_config.py,v retrieving revision 1.307 retrieving revision 1.308 diff -C2 -d -r1.307 -r1.308 *** freevo_config.py30 Dec 2003 15:26:56 - 1.307 --- freevo_config.py31 Dec 2003 16:00:51 - 1.308 *** *** 939,943 if CONF.display == 'x11' and CONF.xine: XINE_VO_DEV = 'xv' ! XINE_COMMAND = '%s -pq -g -B --geometry %sx%s+0+0 --no-splash' % \ (CONF.xine, CONF.width, CONF.height) --- 939,943 if CONF.display == 'x11' and CONF.xine: XINE_VO_DEV = 'xv' ! XINE_COMMAND = '%s --hide-gui -pq -g -B --geometry %sx%s+0+0 --no-splash' % \ (CONF.xine, CONF.width, CONF.height) --- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278alloc_id=3371op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv ivtv.py,1.11,1.12
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv11581/src/tv Modified Files: ivtv.py Log Message: No longer override setstd because the mspSetMatrix() call was only to work around a (fixed) ivtv bug. Also removed the setinput call because that is now taken care of by the VideoGroup and channels.py. Index: ivtv.py === RCS file: /cvsroot/freevo/freevo/src/tv/ivtv.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ivtv.py 30 Nov 2003 16:30:58 - 1.11 --- ivtv.py 31 Dec 2003 16:05:34 - 1.12 *** *** 10,13 --- 10,18 # --- # $Log$ + # Revision 1.12 2003/12/31 16:05:34 rshortt + # No longer override setstd because the mspSetMatrix() call was only to work + # around a (fixed) ivtv bug. Also removed the setinput call because that is + # now taken care of by the VideoGroup and channels.py. + # # Revision 1.11 2003/11/30 16:30:58 rshortt # Convert some tv variables to new format (TV_). *** *** 91,100 - def setstd(self, value): - tv.v4l2.Videodev.setstd(self, value) - time.sleep(1) - self.mspSetMatrix() - - def getCodecInfo(self): val = struct.pack( CODEC_ST, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ) --- 96,99 *** *** 117,122 tv.v4l2.Videodev.init_settings(self) - - self.setinput(opts['input']) (width, height) = string.split(opts['resolution'], 'x') --- 116,119 --- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278alloc_id=3371op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv channels.py,1.10,1.11 epg_xmltv.py,1.39,1.40
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv12037/src/tv
Modified Files:
channels.py epg_xmltv.py
Log Message:
Use a fifth field in TV_CHANNELS to specify an optional VideoGroup
(VIDEO_GROUPS index). Also fix a frequency bug in channels.py.
Index: channels.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/channels.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** channels.py 25 Nov 2003 16:32:33 - 1.10
--- channels.py 31 Dec 2003 16:08:08 - 1.11
***
*** 10,13
--- 10,17
# ---
# $Log$
+ # Revision 1.11 2003/12/31 16:08:08 rshortt
+ # Use a fifth field in TV_CHANNELS to specify an optional VideoGroup
+ # (VIDEO_GROUPS index). Also fix a frequency bug in channels.py.
+ #
# Revision 1.10 2003/11/25 16:32:33 rshortt
# Make plugin_external_tuner work again.
***
*** 123,127
if chan_info[2] == chan:
try:
! group = chan_info[3]
except:
# XXX: put a better exception here
--- 127,131
if chan_info[2] == chan:
try:
! group = int(chan_info[4])
except:
# XXX: put a better exception here
***
*** 161,171
if vg.tuner_type == 'external':
- if vg.input_type == 'tuner' and vg.tuner_chan:
- freq = self.tunerSetFreq(vg.tuner_chan, app, app_cmd)
-
tuner = plugin.getbyname('EXTERNAL_TUNER')
tuner.setChannel(new_chan)
! return freq
else:
--- 165,176
if vg.tuner_type == 'external':
tuner = plugin.getbyname('EXTERNAL_TUNER')
tuner.setChannel(new_chan)
! if vg.input_type == 'tuner' and vg.tuner_chan:
! freq = self.tunerSetFreq(vg.tuner_chan, app, app_cmd)
! return freq
!
! return 0
else:
Index: epg_xmltv.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/epg_xmltv.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** epg_xmltv.py16 Nov 2003 17:38:48 - 1.39
--- epg_xmltv.py31 Dec 2003 16:08:08 - 1.40
***
*** 10,13
--- 10,17
# ---
# $Log$
+ # Revision 1.40 2003/12/31 16:08:08 rshortt
+ # Use a fifth field in TV_CHANNELS to specify an optional VideoGroup
+ # (VIDEO_GROUPS index). Also fix a frequency bug in channels.py.
+ #
# Revision 1.39 2003/11/16 17:38:48 dischi
# i18n patch from David Sagnol
***
*** 288,293
# Handle the optional time-dependent station info
c.times = []
! if len(data) 3:
! for (days, start_time, stop_time) in data[3:]:
c.times.append((days, int(start_time), int(stop_time)))
guide.AddChannel(c)
--- 292,297
# Handle the optional time-dependent station info
c.times = []
! if len(data) 3 and len(data[3:4]) == 3:
! for (days, start_time, stop_time) in data[3:4]:
c.times.append((days, int(start_time), int(stop_time)))
guide.AddChannel(c)
---
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278alloc_id=3371op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins ivtv_record.py,1.16,1.17
Update of /cvsroot/freevo/freevo/src/tv/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv12363/src/tv/plugins Modified Files: ivtv_record.py Log Message: Use the VideoGroup for this channel to change to the correct input on the v4l device. Index: ivtv_record.py === RCS file: /cvsroot/freevo/freevo/src/tv/plugins/ivtv_record.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ivtv_record.py 28 Nov 2003 19:26:37 - 1.16 --- ivtv_record.py 31 Dec 2003 16:09:32 - 1.17 *** *** 11,14 --- 11,18 # --- # $Log$ + # Revision 1.17 2003/12/31 16:09:32 rshortt + # Use the VideoGroup for this channel to change to the correct input on the + # v4l device. + # # Revision 1.16 2003/11/28 19:26:37 dischi # renamed some config variables *** *** 154,157 --- 158,165 v.init_settings() + vg = fc.getVideoGroup(self.prog.tunerid) + + print 'Setting Input to %s' % vg.input_num + v.setinput(vg.input_num) print 'Setting Channel to %s' % self.prog.tunerid --- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278alloc_id=3371op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv tvmenu.py,1.9,1.10
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv12656/src/tv
Modified Files:
tvmenu.py
Log Message:
Make it possible to have a tv mainmenu plugin.
Index: tvmenu.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/tvmenu.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tvmenu.py 28 Nov 2003 19:26:37 - 1.9
--- tvmenu.py 31 Dec 2003 16:10:30 - 1.10
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.10 2003/12/31 16:10:30 rshortt
+ # Make it possible to have a tv mainmenu plugin.
+ #
# Revision 1.9 2003/11/28 19:26:37 dischi
# renamed some config variables
***
*** 193,196
--- 196,203
items.append(menu.MenuItem(_('Search Guide'), action=self.show_search))
# items.append(menu.MenuItem('View Favorites', action=self.show_favorites))
+
+ plugins_list = plugin.get('mainmenu_tv')
+ for p in plugins_list:
+ items += p.items(self)
menuw.pushmenu(menu.Menu(_('TV Main Menu'), items, item_types = 'tv'))
---
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278alloc_id=3371op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins mplayer.py,1.29,1.30
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv12830/src/tv/plugins
Modified Files:
mplayer.py
Log Message:
Make it possible to change channels between those that have different
VideoGroups. For example, on my setup channel 3 is my webcam, 4-50 is
analog cable, and 200+ is my satellite system. I can start on channel 3,
see my webcam on the tv (security cam), channel+ and instantly view my
cable channels and channel+ through to my satellite channels.
Index: mplayer.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** mplayer.py 27 Nov 2003 03:11:08 - 1.29
--- mplayer.py 31 Dec 2003 16:13:15 - 1.30
***
*** 10,13
--- 10,20
# ---
# $Log$
+ # Revision 1.30 2003/12/31 16:13:15 rshortt
+ # Make it possible to change channels between those that have different
+ # VideoGroups. For example, on my setup channel 3 is my webcam, 4-50 is
+ # analog cable, and 200+ is my satellite system. I can start on channel 3,
+ # see my webcam on the tv (security cam), channel+ and instantly view my
+ # cable channels and channel+ through to my satellite channels.
+ #
# Revision 1.29 2003/11/27 03:11:08 rshortt
# Shuffle things around a little bit and add ivtv capabilities. I intend to
***
*** 149,159
! def Play(self, mode, tuner_channel=None, channel_change=0):
if not tuner_channel:
tuner_channel = self.fc.getChannel()
vg = self.current_vg = self.fc.getVideoGroup(tuner_channel)
!
# Convert to MPlayer TV setting strings
--- 156,169
! def Play(self, mode, tuner_channel=None):
!
! print 'PLAY CHAN: %s' % tuner_channel
if not tuner_channel:
tuner_channel = self.fc.getChannel()
+ print 'PLAY CHAN: %s' % tuner_channel
vg = self.current_vg = self.fc.getVideoGroup(tuner_channel)
! print 'PLAY GROUP: %s' % vg.desc
# Convert to MPlayer TV setting strings
***
*** 173,176
--- 183,187
ivtv_dev = ivtv.IVTV(vg.vdev)
ivtv_dev.init_settings()
+ ivtv_dev.setinput(vg.input_num)
ivtv_dev.print_settings()
self.fc.chanSet(tuner_channel)
***
*** 181,184
--- 192,202
args += (config.MPLAYER_ARGS['ivtv'],)
+ elif vg.group_type == 'webcam':
+ self.fc.chanSet(tuner_channel, app='mplayer')
+ tvcmd = ''
+
+ if config.MPLAYER_ARGS.has_key('webcam'):
+ args += (config.MPLAYER_ARGS['webcam'],)
+
else:
freq_khz = self.fc.chanSet(tuner_channel, app='mplayer')
***
*** 255,261
! def Stop(self):
mixer = plugin.getbyname('MIXER')
! if mixer:
mixer.setLineinVolume(0)
mixer.setMicVolume(0)
--- 273,279
! def Stop(self, channel_change=0):
mixer = plugin.getbyname('MIXER')
! if mixer and not channel_change:
mixer.setLineinVolume(0)
mixer.setMicVolume(0)
***
*** 265,269
rc.app(self.prev_app)
! if osd.focused_app():
osd.focused_app().show()
--- 283,287
rc.app(self.prev_app)
! if osd.focused_app() and not channel_change:
osd.focused_app().show()
***
*** 280,285
elif event == em.TV_CHANNEL_UP or event == em.TV_CHANNEL_DOWN:
! # XXX: channel Up/Down code will have to be reworked in order
! # to handle multiple VideoGroups between channels.
if self.mode == 'vcr':
--- 298,316
elif event == em.TV_CHANNEL_UP or event == em.TV_CHANNEL_DOWN:
!
! if event == em.TV_CHANNEL_UP:
! nextchan = self.fc.getNextChannel()
! else:
! nextchan = self.fc.getPrevChannel()
!
! print 'NEXT CHAN: %s' % nextchan
! nextvg = self.fc.getVideoGroup(nextchan)
! print 'NEXT GROUP: %s' % nextvg.desc
!
! if self.current_vg != nextvg:
! print 'NEW GROUP!'
! self.Stop(channel_change=1)
! self.Play('tv', nextchan)
! return TRUE
if self.mode == 'vcr':
***
*** 287,305
elif self.current_vg.group_type == 'ivtv':
! # Go to the prev/next channel in the list
! if event == em.TV_CHANNEL_UP
[Freevo-cvslog] freevo/src/tv/plugins ivtv_basic_tv.py,1.13,NONE
Update of /cvsroot/freevo/freevo/src/tv/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv13974 Removed Files: ivtv_basic_tv.py Log Message: Atticing ivtv_basic_tv.py because it is depricated by the tv.mplayer plugin now since that has ivtv capabilities. --- ivtv_basic_tv.py DELETED --- --- This SF.net email is sponsored by: IBM Linux Tutorials. Become an expert in LINUX or just sharpen your skills. Sign up for IBM's Free Linux Tutorials. Learn everything from the bash shell to sys admin. Click now! http://ads.osdn.com/?ad_id=1278alloc_id=3371op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src directory.py,1.74,1.75
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1691
Modified Files:
directory.py
Log Message:
Fix a typo.
Index: directory.py
===
RCS file: /cvsroot/freevo/freevo/src/directory.py,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** directory.py8 Dec 2003 20:37:33 - 1.74
--- directory.py10 Dec 2003 13:14:24 - 1.75
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.75 2003/12/10 13:14:24 rshortt
+ # Fix a typo.
+ #
# Revision 1.74 2003/12/08 20:37:33 dischi
# merged Playlist and RandomPlaylist into one class
***
*** 439,443
self.arg = arg
self.menuw = menuw
! pb = PasswordInputBox(text=_('Enter Password'), handler=self.pass_cmp_cp)
pb.show()
else:
--- 442,446
self.arg = arg
self.menuw = menuw
! pb = PasswordInputBox(text=_('Enter Password'), handler=self.pass_cmp_cb)
pb.show()
else:
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/www/htdocs manualrecord.rpy,1.7,1.8
Update of /cvsroot/freevo/freevo/src/www/htdocs In directory sc8-pr-cvs1:/tmp/cvs-serv21279/src/www/htdocs Modified Files: manualrecord.rpy Log Message: Display displayname instead of tunerid. Index: manualrecord.rpy === RCS file: /cvsroot/freevo/freevo/src/www/htdocs/manualrecord.rpy,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** manualrecord.rpy20 Oct 2003 02:36:21 - 1.7 --- manualrecord.rpy11 Dec 2003 01:56:31 - 1.8 *** *** 134,138 channelselect = 'select name=chan' for ch in guide.chan_list: ! channelselect = channelselect + 'option value='+ch.id+''+str(ch.tunerid)+\n channelselect = channelselect + /select\n --- 134,138 channelselect = 'select name=chan' for ch in guide.chan_list: ! channelselect = channelselect + 'option value='+ch.id+''+str(ch.displayname)+\n channelselect = channelselect + /select\n --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/RobShortt tv_grab_multiple,NONE,1.1
Update of /cvsroot/freevo/freevo/WIP/RobShortt In directory sc8-pr-cvs1:/tmp/cvs-serv27478 Added Files: tv_grab_multiple Log Message: A script to use as your XMLTV_GRABBER in local_conf.py for combining listings from multiple providers. You must have xmltv config files for each provider: tv_grab_na --config-file=/etc/freevo/tv_grab_na-A.conf --configure tv_grab_na --config-file=/etc/freevo/tv_grab_na-B.conf --configure Where the providers you are interested in are A and B. The script will run a grabber for each configured provider (see this script for details - modify the PROVIDERS entry) and combine the results with tv_cat. This can be run using the tv_grab Freevo helper. --- NEW FILE: tv_grab_multiple --- #!/bin/bash export PATH=/usr/bin:/usr/local/bin:/bin:/usr/sbin PROVIDERS=expressvu eastlink ARGS=$* for i in $PROVIDERS do tv_grab_na --config-file /etc/freevo/tv_grab_na-$i.conf $ARGS cp /tmp/TV.xml.tmp /tmp/TV.xml-$i done CATFILES= for i in $PROVIDERS do CATFILES=$CATFILES /tmp/TV.xml-$i done tv_cat $CATFILES /tmp/TV.xml.tmp echo $0: finished combining $CATFILES --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins generic_record.py,1.12,1.13
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv11727/src/tv/plugins
Modified Files:
generic_record.py
Log Message:
Add some new cl_options: frequency, base_filename, title, and sub-title.
Index: generic_record.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/generic_record.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** generic_record.py 28 Nov 2003 19:26:37 - 1.12
--- generic_record.py 5 Dec 2003 02:26:34 - 1.13
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.13 2003/12/05 02:26:34 rshortt
+ # Add some new cl_options: frequency, base_filename, title, and sub-title.
+ #
# Revision 1.12 2003/11/28 19:26:37 dischi
# renamed some config variables
***
*** 70,73
--- 73,77
from event import *
+ from tv.channels import FreevoChannels
DEBUG = config.DEBUG
***
*** 93,96
--- 97,101
if DEBUG: print 'ACTIVATING GENERIC RECORD PLUGIN'
+ self.fc = FreevoChannels()
self.thread = Record_Thread()
self.thread.setDaemon(1)
***
*** 100,105
--- 105,116
def Record(self, rec_prog):
+ frequency = self.fc.chanSet(str(rec_prog.tunerid), 'record plugin')
+
cl_options = { 'channel' : rec_prog.tunerid,
+'frequency' : frequency,
'filename' : config.TV_RECORD_DIR + '/' + rec_prog.filename,
+'base_filename' : rec_prog.filename,
+'title' : rec_prog.title,
+'sub-title' : rec_prog.sub_title,
'seconds' : rec_prog.rec_duration }
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.18,1.19
Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1:/tmp/cvs-serv7203/src/helpers
Modified Files:
recordserver.py
Log Message:
Make the search function check the sub_title of the programs.
Index: recordserver.py
===
RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** recordserver.py 24 Nov 2003 01:59:59 - 1.18
--- recordserver.py 30 Nov 2003 13:07:27 - 1.19
***
*** 7,10
--- 7,13
# ---
# $Log$
+ # Revision 1.19 2003/11/30 13:07:27 rshortt
+ # Make the search function check the sub_title of the programs.
+ #
# Revision 1.18 2003/11/24 01:59:59 rshortt
# Adding support for the padding of recordings with X minutes before and
***
*** 299,303
if prog.stop now:
continue
! if regex.match(prog.title) or regex.match(prog.desc):
if DEBUG: log.debug('PROGRAM MATCH: %s' % prog)
matches.append(prog)
--- 302,307
if prog.stop now:
continue
! if regex.match(prog.title) or regex.match(prog.desc) \
!or regex.match(prog.sub_title):
if DEBUG: log.debug('PROGRAM MATCH: %s' % prog)
matches.append(prog)
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/RobShortt TODO,1.18,1.19
Update of /cvsroot/freevo/freevo/WIP/RobShortt In directory sc8-pr-cvs1:/tmp/cvs-serv7203/WIP/RobShortt Modified Files: TODO Log Message: Make the search function check the sub_title of the programs. Index: TODO === RCS file: /cvsroot/freevo/freevo/WIP/RobShortt/TODO,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TODO27 Nov 2003 17:36:35 - 1.18 --- TODO30 Nov 2003 13:07:27 - 1.19 *** *** 26,30 -Help with a Freevo configuration tool interface by giving ideas and other useful input. - -Make the guide search feature seatch the sub-title as well. -Add dvb(-s, at least) support for recording and viewing using the dvr device. -Add a start recording this NOW feature by pressing REC while watching live --- 26,29 --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.297,1.298
Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1:/tmp/cvs-serv11194
Modified Files:
freevo_config.py
Log Message:
Convert some tv variables to new format (TV_).
Index: freevo_config.py
===
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.297
retrieving revision 1.298
diff -C2 -d -r1.297 -r1.298
*** freevo_config.py30 Nov 2003 14:42:43 - 1.297
--- freevo_config.py30 Nov 2003 16:30:57 - 1.298
***
*** 942,946
#
# TV_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
! # VCR_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
#
# NORM: ntsc, pal, secam
--- 942,946
#
# TV_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
! # TV_VCR_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
#
# NORM: ntsc, pal, secam
***
*** 1019,1026
# if using the persitant recordserver
! RECORD_SCHEDULE = '%s/record_schedule.xml' % FREEVO_CACHEDIR
! RECORD_SERVER_IP = 'localhost'
! RECORD_SERVER_PORT = 18001
# start every recording X minutes before scheduled,
--- 1019,1026
# if using the persitant recordserver
! TV_RECORD_SCHEDULE = '%s/record_schedule.xml' % FREEVO_CACHEDIR
! TV_RECORD_SERVER_IP = 'localhost'
! TV_RECORD_SERVER_PORT = 18001
# start every recording X minutes before scheduled,
***
*** 1028,1032
# This must be a value in seconds although at the moment only has
# the percision of one minute.
! RECORD_PADDING = 0 * 60
if os.uname()[0] == 'FreeBSD':
--- 1028,1032
# This must be a value in seconds although at the moment only has
# the percision of one minute.
! TV_RECORD_PADDING = 0 * 60
if os.uname()[0] == 'FreeBSD':
***
*** 1081,1085
# XXX Not used yet
! VCR_SETTINGS = '%s composite1 %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
--- 1081,1085
# XXX Not used yet
! TV_VCR_SETTINGS = '%s composite1 %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
***
*** 1093,1097
# 5 (mpeg2_pes_v), 7 (mpeg2_pes_a), 10 (dvd)
! IVTV_OPTIONS = {
'input' : 4,
'resolution': '720x480',
--- 1093,1097
# 5 (mpeg2_pes_v), 7 (mpeg2_pes_a), 10 (dvd)
! TV_IVTV_OPTIONS = {
'input' : 4,
'resolution': '720x480',
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv ivtv.py,1.10,1.11 record_client.py,1.10,1.11
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv11194/src/tv Modified Files: ivtv.py record_client.py Log Message: Convert some tv variables to new format (TV_). Index: ivtv.py === RCS file: /cvsroot/freevo/freevo/src/tv/ivtv.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ivtv.py 5 Sep 2003 02:48:12 - 1.10 --- ivtv.py 30 Nov 2003 16:30:58 - 1.11 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.11 2003/11/30 16:30:58 rshortt + # Convert some tv variables to new format (TV_). + # # Revision 1.10 2003/09/05 02:48:12 rshortt # Removing src/tv and src/www from PYTHONPATH in the freevo script. Therefore any module that was imported from src/tv/ or src/www that didn't have a leading 'tv.' or 'www.' needed it added. Also moved tv/tv.py to tv/tvmenu.py to avoid namespace conflicts. *** *** 111,115 def init_settings(self, opts=None): if not opts: ! opts = config.IVTV_OPTIONS tv.v4l2.Videodev.init_settings(self) --- 114,118 def init_settings(self, opts=None): if not opts: ! opts = config.TV_IVTV_OPTIONS tv.v4l2.Videodev.init_settings(self) Index: record_client.py === RCS file: /cvsroot/freevo/freevo/src/tv/record_client.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** record_client.py16 Nov 2003 17:38:48 - 1.10 --- record_client.py30 Nov 2003 16:30:58 - 1.11 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.11 2003/11/30 16:30:58 rshortt + # Convert some tv variables to new format (TV_). + # # Revision 1.10 2003/11/16 17:38:48 dischi # i18n patch from David Sagnol *** *** 56,60 server_string = 'http://%s:%s/' % \ ! (config.RECORD_SERVER_IP, config.RECORD_SERVER_PORT) server = xmlrpclib.Server(server_string) --- 59,63 server_string = 'http://%s:%s/' % \ ! (config.TV_RECORD_SERVER_IP, config.TV_RECORD_SERVER_PORT) server = xmlrpclib.Server(server_string) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo local_conf.py.example,1.24,1.25
Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1:/tmp/cvs-serv11610
Modified Files:
local_conf.py.example
Log Message:
Ran convert_config helper on this too.
Index: local_conf.py.example
===
RCS file: /cvsroot/freevo/freevo/local_conf.py.example,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** local_conf.py.example 25 Nov 2003 16:38:27 - 1.24
--- local_conf.py.example 30 Nov 2003 16:33:51 - 1.25
***
*** 141,145
#
# Should directories sorted by date instead of filename
! # 0 = no, 1 = yes, 2 = no for normal menus, yes for DIR_RECORD
#
# DIRECTORY_SORT_BY_DATE = 2
--- 141,145
#
# Should directories sorted by date instead of filename
! # 0 = no, 1 = yes, 2 = no for normal menus, yes for TV_RECORD_DIR
#
# DIRECTORY_SORT_BY_DATE = 2
***
*** 165,169
# toggle with DISPLAY will be disabled
#
! # FORCE_SKIN_LAYOUT = -1
#
--- 165,169
# toggle with DISPLAY will be disabled
#
! # DIRECTORY_FORCE_SKIN_LAYOUT = -1
#
***
*** 172,179
#
# This will show the title and the track number
! # AUDIO_FORMAT_STRING = '%(n)s - %(t)s'
# This is the default - track name only
#
! # AUDIO_FORMAT_STRING = '%(t)s'
#
--- 172,179
#
# This will show the title and the track number
! # DIRECTORY_AUDIO_FORMAT_STRING = '%(n)s - %(t)s'
# This is the default - track name only
#
! # DIRECTORY_AUDIO_FORMAT_STRING = '%(t)s'
#
***
*** 181,185
# 1 all the time and only be disabled in directories with broken tags
#
! # USE_MEDIAID_TAG_NAMES = 1
--- 181,185
# 1 all the time and only be disabled in directories with broken tags
#
! # DIRECTORY_USE_MEDIAID_TAG_NAMES = 1
***
*** 222,226
# Where the movie files can be found.
#
! # DIR_MOVIES = [ ('action movies', 'movies/action'),
#('funny stuff', 'movies/comedy') ]
--- 222,226
# Where the movie files can be found.
#
! # VIDEO_ITEMS = [ ('action movies', 'movies/action'),
#('funny stuff', 'movies/comedy') ]
***
*** 229,233
#
# XXX the path doesn't work from the www cgi scripts!
! # DIR_RECORD = 'testfiles/Movies/Recorded'
#
--- 229,233
#
# XXX the path doesn't work from the www cgi scripts!
! # TV_RECORD_DIR = 'testfiles/Movies/Recorded'
#
***
*** 240,248
#
# Directory containing images for tv shows. A tv show maches the regular
! # expression TV_SHOW_REGEXP, e.g. Name 3x10 - Title. If an image
# name.(png|jpg) (lowercase) is in this directory, it will be taken as cover
# image
#
! # TV_SHOW_DATA_DIR = testfiles/tv-show-images/
#
--- 240,248
#
# Directory containing images for tv shows. A tv show maches the regular
! # expression VIDEO_SHOW_REGEXP, e.g. Name 3x10 - Title. If an image
# name.(png|jpg) (lowercase) is in this directory, it will be taken as cover
# image
#
! # VIDEO_SHOW_DATA_DIR = testfiles/tv-show-images/
#
***
*** 254,258
#
! # Only scan MOVIE_DATA_DIR and TV_SHOW_DATA_DIR for fxd files containing
# informations about a disc. If you only have the fxd files for discs in
# one of this directories (and subdirectories), set this to 1, it will
--- 254,258
#
! # Only scan MOVIE_DATA_DIR and VIDEO_SHOW_DATA_DIR for fxd files containing
# informations about a disc. If you only have the fxd files for discs in
# one of this directories (and subdirectories), set this to 1, it will
***
*** 260,264
# in your normal movie tree.
#
! # ONLY_SCAN_DATADIR = 1
--- 260,264
# in your normal movie tree.
#
! # VIDEO_ONLY_SCAN_DATADIR = 1
***
*** 273,277
# The 'mplayer options' field can be omitted.
#
! # DIR_AUDIO = [ ('Test Files', 'testfiles/Music') ]
--- 273,277
# The 'mplayer options' field can be omitted.
#
! # AUDIO_ITEMS = [ ('Test Files', 'testfiles/Music') ]
***
*** 282,286
# Where the image files can be found.
! # DIR_IMAGES = [ ('Arizona 2002', '/video/SlideShows/arizona-2002.ssr'),
#('Carmel 2002', '/video/SlideShows/carmel.ssr'),
#('Pics', '/video/SlideShows') ]
--- 282,286
# Where the image files can be found.
! # IMAGE_ITEMS = [ ('Arizona 2002', '/video/SlideShows/arizona-2002.ssr'),
#('Carmel 2002', '/video/SlideShows/carmel.ssr'),
#('Pics', '/video/SlideShows') ]
***
*** 290,297
# It uses a new configuration option:
! # SUFFIX_IMAGE_SSHOW = [ 'ssr' ]
! # This defines the file extensions of slideshow playlists. When DIR_IMAGES
! # is parsed, it will look for entries that match the SUFFIX_IMAGE_SSHOW
# patterns. If it finds a match, then it will classify that entry as a
[Freevo-cvslog] freevo/WIP/RobShortt TODO,1.12,1.13
Update of /cvsroot/freevo/freevo/WIP/RobShortt In directory sc8-pr-cvs1:/tmp/cvs-serv31155/WIP/RobShortt Modified Files: TODO Log Message: Index: TODO === RCS file: /cvsroot/freevo/freevo/WIP/RobShortt/TODO,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TODO4 Oct 2003 03:10:57 - 1.12 --- TODO27 Nov 2003 16:22:59 - 1.13 *** *** 8,20 ! -Centralize the channel changing code for the tv and recording plugins (see ! WIP/RobShortt/channels.py). This will allow us to use Freevo's channel list ! and custom frequencies for all tv and recording plugins and also incorporate ! ways of channel changing on an external tuner (cable or sattelite box for ! example - see WIP/RobShortt/irtrans-echostar.py). ! -Add support for multiple V4L devices (see WIP/RobShortt/channels.py) and ! 'video groups'. -Sumbit a patch to xine for setting the channel frequency in slave mode. - -Build a binary runtime for the 1.4 release. --- 8,19 ! -Keep working on and improving the Freevo channel handling code ! (src/tv/channels.py) and adding support for this in more plugins. ! -Handle VideoGroup switching in channels.py and plugins so we can change ! channels when the current and next channels belong to different VideoGroups ! and therefore may have different device and input combinations. For example ! mplayer would need to be restarted for the new group in order to read from ! a different device. -Sumbit a patch to xine for setting the channel frequency in slave mode. *** *** 22,27 === ! -Fix removing a scheduled recording so it refreshes the scheduled list right ! away. -Highlight shows which are scheduled to be recorded in the program guide. -Make a xine tv viewing plugin! Xine does timeshitfing and I think this is the --- 21,25 === ! -Make the guide search feature seatch the sub-title as well. -Highlight shows which are scheduled to be recorded in the program guide. -Make a xine tv viewing plugin! Xine does timeshitfing and I think this is the --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/RobShortt TODO,1.13,1.14
Update of /cvsroot/freevo/freevo/WIP/RobShortt In directory sc8-pr-cvs1:/tmp/cvs-serv31934/WIP/RobShortt Modified Files: TODO Log Message: Index: TODO === RCS file: /cvsroot/freevo/freevo/WIP/RobShortt/TODO,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TODO27 Nov 2003 16:22:59 - 1.13 --- TODO27 Nov 2003 16:27:21 - 1.14 *** *** 21,24 --- 21,29 === + -Make the VIDEO_GROUPS / VideoGroup configuration for local_conf.py simpler. + I think an xml based config file (local_conf.fxd) could be the answer. We + could leverage Dischi's recent fxd work here. + -Help with a Freevo configuration tool interface by giving ideas and other + useful input. -Make the guide search feature seatch the sub-title as well. -Highlight shows which are scheduled to be recorded in the program guide. *** *** 28,33 -Create a python / Freevo interface to xine's OSD API. -Enhancements to record_client/server. - -Help with the Freevo configuration tool interface by giveing ideas and other - useful input. -Make Freevo work really good on an epia M1 w/ CLE266. I have one for testing now! --- 33,36 --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/RobShortt TODO,1.17,1.18
Update of /cvsroot/freevo/freevo/WIP/RobShortt In directory sc8-pr-cvs1:/tmp/cvs-serv13409 Modified Files: TODO Log Message: Oops. Index: TODO === RCS file: /cvsroot/freevo/freevo/WIP/RobShortt/TODO,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** TODO27 Nov 2003 17:31:00 - 1.17 --- TODO27 Nov 2003 17:36:35 - 1.18 *** *** 29,37 -Add dvb(-s, at least) support for recording and viewing using the dvr device. -Add a start recording this NOW feature by pressing REC while watching live -Add a manually record option to the tv main menu and / or the tvguide, most useful if there's no xmltv data available. -Conflict resolution schemes for recordings, automatic resolution or notifications for manual intervention. - tv (for ivtv and dvb). -Highlight shows which are scheduled to be recorded in the program guide. -Make a xine tv viewing plugin! Xine does timeshitfing and I think this is the --- 29,37 -Add dvb(-s, at least) support for recording and viewing using the dvr device. -Add a start recording this NOW feature by pressing REC while watching live + tv (for ivtv and dvb). -Add a manually record option to the tv main menu and / or the tvguide, most useful if there's no xmltv data available. -Conflict resolution schemes for recordings, automatic resolution or notifications for manual intervention. -Highlight shows which are scheduled to be recorded in the program guide. -Make a xine tv viewing plugin! Xine does timeshitfing and I think this is the --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins mplayer.py,1.28,1.29
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv31156
Modified Files:
mplayer.py
Log Message:
Shuffle things around a little bit and add ivtv capabilities. I intend to
depricate the ivtv_basic_tv plugin in favour of this once since that is
just an mplayer plugin as well and I don't want to duplicate too much code.
I will focus my development effort on this plugin instead of ivtv_basic_tv
and will also be really using this one so I can test it out myself. :)
I am planning on adding dvb support to this plugin as well.
Index: mplayer.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** mplayer.py 25 Nov 2003 09:37:00 - 1.28
--- mplayer.py 27 Nov 2003 03:11:08 - 1.29
***
*** 10,13
--- 10,23
# ---
# $Log$
+ # Revision 1.29 2003/11/27 03:11:08 rshortt
+ # Shuffle things around a little bit and add ivtv capabilities. I intend to
+ # depricate the ivtv_basic_tv plugin in favour of this once since that is
+ # just an mplayer plugin as well and I don't want to duplicate too much code.
+ #
+ # I will focus my development effort on this plugin instead of ivtv_basic_tv
+ # and will also be really using this one so I can test it out myself. :)
+ #
+ # I am planning on adding dvb support to this plugin as well.
+ #
# Revision 1.28 2003/11/25 09:37:00 krister
# Bugfixes, works for me now
***
*** 100,103
--- 110,114
import tv.epg_xmltv as epg # The Electronic Program Guide
from tv.channels import FreevoChannels
+ import tv.ivtv as ivtv
import plugin
***
*** 143,148
tuner_channel = self.fc.getChannel()
- freq_khz = self.fc.chanSet(tuner_channel, app='mplayer')
- tuner_freq = '%1.3f' % (freq_khz / 1000.0)
vg = self.current_vg = self.fc.getVideoGroup(tuner_channel)
--- 154,157
***
*** 156,165
outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
if mode == 'tv':
! tvcmd = ('tv:// -tv driver=%s:freq=%s:%s:%s:'
! '%s:width=%s:height=%s:%s %s' %
! (config.TV_DRIVER, tuner_freq, device, input, norm,
! w, h, outfmt, config.TV_OPTS))
elif mode == 'vcr':
--- 165,196
outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
+ # Build the MPlayer command
+ args = (config.MPLAYER_NICE, config.MPLAYER_CMD, config.MPLAYER_VO_DEV,
+ config.MPLAYER_VO_DEV_OPTS)
if mode == 'tv':
! if vg.group_type == 'ivtv':
! ivtv_dev = ivtv.IVTV(vg.vdev)
! ivtv_dev.init_settings()
! ivtv_dev.print_settings()
! self.fc.chanSet(tuner_channel)
!
! tvcmd = vg.vdev
!
! if config.MPLAYER_ARGS.has_key('ivtv'):
! args += (config.MPLAYER_ARGS['ivtv'],)
!
! else:
! freq_khz = self.fc.chanSet(tuner_channel, app='mplayer')
! tuner_freq = '%1.3f' % (freq_khz / 1000.0)
!
! tvcmd = ('tv:// -tv driver=%s:freq=%s:%s:%s:'
! '%s:width=%s:height=%s:%s %s' %
! (config.TV_DRIVER, tuner_freq, device, input, norm,
! w, h, outfmt, config.TV_OPTS))
!
! if config.MPLAYER_ARGS.has_key('tv'):
! args += (config.MPLAYER_ARGS['tv'],)
!
elif mode == 'vcr':
***
*** 169,185
w, h, outfmt, config.TV_OPTS))
else:
print 'Mode %s is not implemented' % mode # XXX ui.message()
return
!
! # Build the MPlayer command
! args = (config.MPLAYER_NICE, config.MPLAYER_CMD, config.MPLAYER_VO_DEV,
! config.MPLAYER_VO_DEV_OPTS, tvcmd)
!
! if config.MPLAYER_ARGS.has_key('tv'):
! args += (config.MPLAYER_ARGS['tv'],)
!
! mpl = '--prio=%s %s -vo %s%s -fs %s %s -slave' % args
command = mpl
--- 200,213
w, h, outfmt, config.TV_OPTS))
+ if config.MPLAYER_ARGS.has_key('tv'):
+ args += (config.MPLAYER_ARGS['tv'],)
+
else:
print 'Mode %s is not implemented' % mode # XXX ui.message()
return
! args += (tvcmd,)
!
! mpl = '--prio=%s %s -vo %s%s -fs %s -slave %s' % args
command = mpl
***
*** 252,266
elif event == em.TV_CHANNEL_UP or event == em.TV_CHANNEL_DOWN:
if self.mode == 'vcr':
return
! # Go
[Freevo-cvslog] freevo/src config.py,1.74,1.75
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1:/tmp/cvs-serv31576 Modified Files: config.py Log Message: Add the property group_type to the VideoGroup class to easier handle special capture cards like those based on ivtv chipsets and dvb cards. Index: config.py === RCS file: /cvsroot/freevo/freevo/src/config.py,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** config.py 25 Nov 2003 01:08:11 - 1.74 --- config.py 27 Nov 2003 03:12:40 - 1.75 *** *** 23,26 --- 23,30 # --- # $Log$ + # Revision 1.75 2003/11/27 03:12:40 rshortt + # Add the property group_type to the VideoGroup class to easier handle special + # capture cards like those based on ivtv chipsets and dvb cards. + # # Revision 1.74 2003/11/25 01:08:11 rshortt # Added a input_num property to the VideoGroup class because it can vary *** *** 194,197 --- 198,203 recordable: True or False. Can you record from this VideoGroup. desc:A nice description for this VideoGroup. + group_type: Special variable to identify devices like dvb or ivtv. This + can be left as default, 'normal', or set to 'ivtv' or 'dvb'. *** *** 199,203 input_num=0, tuner_norm='NTSC', tuner_chanlist='us-cable', tuner_type='internal', tuner_chan=None, ! recordable=True, desc='Freevo default VideoGroup'): # XXX: Put checks in here for supplied values. --- 205,210 input_num=0, tuner_norm='NTSC', tuner_chanlist='us-cable', tuner_type='internal', tuner_chan=None, ! recordable=True, desc='Freevo default VideoGroup', ! group_type='normal'): # XXX: Put checks in here for supplied values. *** *** 212,215 --- 219,223 self.recordable = recordable self.desc = desc + self.group_type = group_type self.in_use = FALSE self.tuner = None --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv channels.py,1.9,1.10
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv29593/src/tv Modified Files: channels.py Log Message: Make plugin_external_tuner work again. Index: channels.py === RCS file: /cvsroot/freevo/freevo/src/tv/channels.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** channels.py 25 Nov 2003 09:34:07 - 1.9 --- channels.py 25 Nov 2003 16:32:33 - 1.10 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.10 2003/11/25 16:32:33 rshortt + # Make plugin_external_tuner work again. + # # Revision 1.9 2003/11/25 09:34:07 krister # Changed the frequency returned to be kHz instead of a scaled value *** *** 104,117 def __init__(self): - # XXX: soon make TV_CHANNELS a list of real objects instead of a - # list of lists. - # self.TV_CHANNELS = the lists of objects or something self.chan_index = 0 ! # XXX: Make sure plugin won't allow you to init any plugin ! # more than once. Also it might be better to move ! # this init line into the recordserver since in the TV ! # interface it will already be initialized in main. ! if 0: # XXX Crashes! plugin.init_special_plugin(config.plugin_external_tuner) --- 107,113 def __init__(self): self.chan_index = 0 ! if config.plugin_external_tuner: plugin.init_special_plugin(config.plugin_external_tuner) *** *** 188,192 (chan, freq) else: - # freq = self.chanlist[str(chan)] freq = tv.freq.CHANLIST[vg.tuner_chanlist][str(chan)] if DEBUG: --- 184,187 --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.291,1.292 local_conf.py.example,1.22,1.23
Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1:/tmp/cvs-serv29593
Modified Files:
freevo_config.py local_conf.py.example
Log Message:
Make plugin_external_tuner work again.
Index: freevo_config.py
===
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.291
retrieving revision 1.292
diff -C2 -d -r1.291 -r1.292
*** freevo_config.py23 Nov 2003 22:05:08 - 1.291
--- freevo_config.py25 Nov 2003 16:32:33 - 1.292
***
*** 372,375
--- 372,382
plugin.activate('tv.mplayer')
+ # control an external tv tuner using irsend or another command
+ # to use this you must reassign plugin_external_tuner in local_conf.py:
+ # plugin_external_tuner = plugin.activate('tv.irsend_generic',
+ # args=('...', '...', ))
+ # Please see each irsend plugin for individual arguments.
+ plugin_external_tuner = 0
+
# support for settings bookmarks (key RECORD) while playing. Also
# auto bookmarking when playback is stopped
Index: local_conf.py.example
===
RCS file: /cvsroot/freevo/freevo/local_conf.py.example,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** local_conf.py.example 23 Nov 2003 18:47:54 - 1.22
--- local_conf.py.example 25 Nov 2003 16:32:33 - 1.23
***
*** 105,108
--- 105,114
# plugin.activate('joy')
+ # control an external tv tuner using irsend or another command
+ # to use this you must reassign plugin_external_tuner in local_conf.py:
+ # plugin_external_tuner = plugin.activate('tv.irsend_generic',
+ # args=('...', '...', ))
+ # Please see each irsend plugin for individual arguments.
+
# Idlebar plugin:
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins irsend_generic.py,1.1,1.2
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv29593/src/tv/plugins
Modified Files:
irsend_generic.py
Log Message:
Make plugin_external_tuner work again.
Index: irsend_generic.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/irsend_generic.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** irsend_generic.py 23 Nov 2003 20:32:05 - 1.1
--- irsend_generic.py 25 Nov 2003 16:32:33 - 1.2
***
*** 13,16
--- 13,19
# ---
# $Log$
+ # Revision 1.2 2003/11/25 16:32:33 rshortt
+ # Make plugin_external_tuner work again.
+ #
# Revision 1.1 2003/11/23 20:32:05 rshortt
# This is a plugin for sending IR commands to an external tuner. You can
***
*** 55,59
Example usage (local_conf.py):
! plugin_external_tuner = plugin.activate('tv.irsend_echostar',
args=('/usr/bin/irsend SEND_ONCE remote_name', ))
--- 58,62
Example usage (local_conf.py):
! plugin_external_tuner = plugin.activate('tv.irsend_generic',
args=('/usr/bin/irsend SEND_ONCE remote_name', ))
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.292,1.293 local_conf.py.example,1.23,1.24
Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1:/tmp/cvs-serv31203
Modified Files:
freevo_config.py local_conf.py.example
Log Message:
Better explanation for plugin_external_tuner.
Index: freevo_config.py
===
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.292
retrieving revision 1.293
diff -C2 -d -r1.292 -r1.293
*** freevo_config.py25 Nov 2003 16:32:33 - 1.292
--- freevo_config.py25 Nov 2003 16:38:26 - 1.293
***
*** 376,380
# plugin_external_tuner = plugin.activate('tv.irsend_generic',
# args=('...', '...', ))
! # Please see each irsend plugin for individual arguments.
plugin_external_tuner = 0
--- 376,381
# plugin_external_tuner = plugin.activate('tv.irsend_generic',
# args=('...', '...', ))
! # Please see each irsend plugin for individual arguments and be sure to
! # alter VIDEO_GROUPS to tell a VideoGroup to use it (tuner_type='external').
plugin_external_tuner = 0
Index: local_conf.py.example
===
RCS file: /cvsroot/freevo/freevo/local_conf.py.example,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** local_conf.py.example 25 Nov 2003 16:32:33 - 1.23
--- local_conf.py.example 25 Nov 2003 16:38:27 - 1.24
***
*** 109,113
# plugin_external_tuner = plugin.activate('tv.irsend_generic',
# args=('...', '...', ))
! # Please see each irsend plugin for individual arguments.
# Idlebar plugin:
--- 109,114
# plugin_external_tuner = plugin.activate('tv.irsend_generic',
# args=('...', '...', ))
! # Please see each irsend plugin for individual arguments and be sure to
! # alter VIDEO_GROUPS to tell a VideoGroup to use it (tuner_type='external').
# Idlebar plugin:
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins mplayer.py,1.25,1.26
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv16212
Modified Files:
mplayer.py
Log Message:
Reverting to r1.23 until we sort out some nasties.
Index: mplayer.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mplayer.py 24 Nov 2003 04:40:29 - 1.25
--- mplayer.py 24 Nov 2003 13:17:48 - 1.26
***
*** 10,23
# ---
# $Log$
! # Revision 1.25 2003/11/24 04:40:29 krister
! # TV viewing is broken(!) Here are some fixes to make it a little better, but it
still cannot change channels when viewing TV.
! #
! # Revision 1.24 2003/11/23 19:53:01 rshortt
! # Move some code into src/tv/channels.py and also make use of Freevo's
! # frequency tables (and custom frequencies).
! #
! # This plugin indirectly makes use of the new VIDEO_GROUPS config item.
! #
! # Please test. I don't have the setup to test this myself.
#
# Revision 1.23 2003/11/06 06:08:38 krister
--- 10,15
# ---
# $Log$
! # Revision 1.26 2003/11/24 13:17:48 rshortt
! # Reverting to r1.23 until we sort out some nasties.
#
# Revision 1.23 2003/11/06 06:08:38 krister
***
*** 83,88
import childapp # Handle child applications
import tv.epg_xmltv as epg # The Electronic Program Guide
! from tv.channels import FreevoChannels
!
import plugin
--- 75,79
import childapp # Handle child applications
import tv.epg_xmltv as epg # The Electronic Program Guide
!
import plugin
***
*** 118,124
self.tuner_chidx = 0# Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
! self.fc = FreevoChannels()
def Play(self, mode, tuner_channel=None, channel_change=0):
--- 109,156
self.tuner_chidx = 0# Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
!
! def TunerSetChannel(self, tuner_channel):
! for pos in range(len(config.TV_CHANNELS)):
! channel = config.TV_CHANNELS[pos]
! if channel[2] == tuner_channel:
! self.tuner_chidx = pos
! return
! print 'ERROR: Cannot find tuner channel %s in the TV channel listing' %
tuner_channel
! self.tuner_chidx = 0
!
!
! def TunerGetChannelInfo(self):
! '''Get program info for the current channel'''
!
! tuner_id = config.TV_CHANNELS[self.tuner_chidx][2]
! chan_name = config.TV_CHANNELS[self.tuner_chidx][1]
! chan_id = config.TV_CHANNELS[self.tuner_chidx][0]
!
! channels = epg.get_guide().GetPrograms(start=time.time(),
!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))
! ts = '(%s-%s)' % (start_s, stop_s)
! prog_info = '%s %s' % (ts, channels[0].programs[0].title)
! else:
! prog_info = 'No info'
!
! return tuner_id, chan_name, prog_info
!
!
! def TunerGetChannel(self):
! return config.TV_CHANNELS[self.tuner_chidx][2]
!
!
! def TunerNextChannel(self):
! self.tuner_chidx = (self.tuner_chidx+1) % len(config.TV_CHANNELS)
+ def TunerPrevChannel(self):
+ self.tuner_chidx = (self.tuner_chidx-1) % len(config.TV_CHANNELS)
+
+
def Play(self, mode, tuner_channel=None, channel_change=0):
***
*** 126,136
try:
! self.fc.chanSet(tuner_channel, app='mplayer')
except ValueError:
pass
if mode == 'tv':
! tuner_freq = self.fc.chanSet(tuner_channel, app='mplayer')
! tuner_channel = self.fc.getChannel()
cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
--- 158,167
try:
! self.TunerSetChannel(tuner_channel)
except ValueError:
pass
if mode == 'tv':
! tuner_channel = self.TunerGetChannel()
cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
***
*** 152,160
outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
-
tvcmd = ('tv://%s -tv driver=%s:%s:%s:%s:'
'%s:width=%s:height=%s:%s %s' %
! (tuner_channel, config.TV_DRIVER, device,
! input, norm, chanlist
[Freevo-cvslog] freevo/src/tv/plugins mplayer.py,1.26,1.26.2.1
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv17561
Modified Files:
Tag: rob
mplayer.py
Log Message:
Some unstable changes on a branch.
Index: mplayer.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -C2 -d -r1.26 -r1.26.2.1
*** mplayer.py 24 Nov 2003 13:17:48 - 1.26
--- mplayer.py 24 Nov 2003 13:25:00 - 1.26.2.1
***
*** 10,15
# ---
# $Log$
! # Revision 1.26 2003/11/24 13:17:48 rshortt
! # Reverting to r1.23 until we sort out some nasties.
#
# Revision 1.23 2003/11/06 06:08:38 krister
--- 10,23
# ---
# $Log$
! # Revision 1.26.2.1 2003/11/24 13:25:00 rshortt
! # Some unstable changes on a branch.
! #
! # Revision 1.24 2003/11/23 19:53:01 rshortt
! # Move some code into src/tv/channels.py and also make use of Freevo's
! # frequency tables (and custom frequencies).
! #
! # This plugin indirectly makes use of the new VIDEO_GROUPS config item.
! #
! # Please test. I don't have the setup to test this myself.
#
# Revision 1.23 2003/11/06 06:08:38 krister
***
*** 75,79
import childapp # Handle child applications
import tv.epg_xmltv as epg # The Electronic Program Guide
!
import plugin
--- 83,88
import childapp # Handle child applications
import tv.epg_xmltv as epg # The Electronic Program Guide
! from tv.channels import FreevoChannels
!
import plugin
***
*** 109,156
self.tuner_chidx = 0# Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
- def TunerSetChannel(self, tuner_channel):
- for pos in range(len(config.TV_CHANNELS)):
- channel = config.TV_CHANNELS[pos]
- if channel[2] == tuner_channel:
- self.tuner_chidx = pos
- return
- print 'ERROR: Cannot find tuner channel %s in the TV channel listing' %
tuner_channel
- self.tuner_chidx = 0
-
-
- def TunerGetChannelInfo(self):
- '''Get program info for the current channel'''
-
- tuner_id = config.TV_CHANNELS[self.tuner_chidx][2]
- chan_name = config.TV_CHANNELS[self.tuner_chidx][1]
- chan_id = config.TV_CHANNELS[self.tuner_chidx][0]
-
- channels = epg.get_guide().GetPrograms(start=time.time(),
-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))
- ts = '(%s-%s)' % (start_s, stop_s)
- prog_info = '%s %s' % (ts, channels[0].programs[0].title)
- else:
- prog_info = 'No info'
-
- return tuner_id, chan_name, prog_info
-
-
- def TunerGetChannel(self):
- return config.TV_CHANNELS[self.tuner_chidx][2]
-
-
- def TunerNextChannel(self):
- self.tuner_chidx = (self.tuner_chidx+1) % len(config.TV_CHANNELS)
-
-
- def TunerPrevChannel(self):
- self.tuner_chidx = (self.tuner_chidx-1) % len(config.TV_CHANNELS)
-
def Play(self, mode, tuner_channel=None, channel_change=0):
--- 118,124
self.tuner_chidx = 0# Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
+ self.fc = FreevoChannels()
def Play(self, mode, tuner_channel=None, channel_change=0):
***
*** 158,167
try:
! self.TunerSetChannel(tuner_channel)
except ValueError:
pass
if mode == 'tv':
! tuner_channel = self.TunerGetChannel()
cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
--- 126,136
try:
! self.fc.chanSet(tuner_channel)
except ValueError:
pass
if mode == 'tv':
! tuner_freq = self.fc.chanSet(app='mplayer')
! tuner_channel = self.fc.getChannel()
cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
***
*** 183,189
outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
! tvcmd = ('tv://%s -tv driver=%s:%s:%s:%s:'
'%s:width=%s:height=%s:%s %s' %
! (tuner_channel, config.TV_DRIVER, device, input, norm,
chanlist, w, h, outfmt, config.TV_OPTS))
# Build the MPlayer command
--- 152,160
outfmt
[Freevo-cvslog] freevo/src/tv/plugins mplayer.py,1.26.2.1,1.26.2.2
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv2633/plugins
Modified Files:
Tag: rob
mplayer.py
Log Message:
Bugfixes.
Index: mplayer.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -C2 -d -r1.26.2.1 -r1.26.2.2
*** mplayer.py 24 Nov 2003 13:25:00 - 1.26.2.1
--- mplayer.py 24 Nov 2003 17:16:40 - 1.26.2.2
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.26.2.2 2003/11/24 17:16:40 rshortt
+ # Bugfixes.
+ #
# Revision 1.26.2.1 2003/11/24 13:25:00 rshortt
# Some unstable changes on a branch.
***
*** 121,135
! def Play(self, mode, tuner_channel=None, channel_change=0):
! if tuner_channel != None:
!
! try:
! self.fc.chanSet(tuner_channel)
! except ValueError:
! pass
if mode == 'tv':
- tuner_freq = self.fc.chanSet(app='mplayer')
tuner_channel = self.fc.getChannel()
--- 124,132
! def Play(self, mode, tuner_channel, channel_change=0):
! tuner_freq = self.fc.chanSet(tuner_channel, app='mplayer')
if mode == 'tv':
tuner_channel = self.fc.getChannel()
***
*** 153,160
! tvcmd = ('tv://%s -tv driver=%s:freq=%s:%s:%s:%s:'
'%s:width=%s:height=%s:%s %s' %
! (tuner_channel, config.TV_DRIVER, tuner_freq, device,
! input, norm, chanlist, w, h, outfmt, config.TV_OPTS))
# Build the MPlayer command
--- 150,157
! tvcmd = ('tv:// -tv driver=%s:freq=%s:%s:%s:%s:'
'%s:width=%s:height=%s:%s %s' %
! (config.TV_DRIVER, tuner_freq, device, input, norm,
! chanlist, w, h, outfmt, config.TV_OPTS))
# Build the MPlayer command
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv channels.py,1.7,1.8
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv2633 Modified Files: channels.py Log Message: Bugfixes. Index: channels.py === RCS file: /cvsroot/freevo/freevo/src/tv/channels.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** channels.py 24 Nov 2003 04:41:14 - 1.7 --- channels.py 24 Nov 2003 17:16:40 - 1.8 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.8 2003/11/24 17:16:40 rshortt + # Bugfixes. + # # Revision 1.7 2003/11/24 04:41:14 krister # Commented out a part that crashes the TV viewer plugin. Please fix! *** *** 133,137 Using this method will not support custom frequencies. ! self.chanSet(self.getNextChannel(), app, app_cmd) --- 136,140 Using this method will not support custom frequencies. ! return self.chanSet(self.getNextChannel(), app, app_cmd) *** *** 140,144 Using this method will not support custom frequencies. ! self.setChannel(self.getPrevChannel(), app, app_cmd) --- 143,147 Using this method will not support custom frequencies. ! return self.chanSet(self.getPrevChannel(), app, app_cmd) *** *** 202,206 return freq else: ! # Letf set the freq ourselves using the V4L device. try: vd = tv.v4l2.Videodev(vg.vdev) --- 205,209 return freq else: ! # Lets set the freq ourselves using the V4L device. try: vd = tv.v4l2.Videodev(vg.vdev) *** *** 225,229 def getPrevChannel(self): ! return (self.chan_index-1) % len(config.TV_CHANNELS) --- 228,232 def getPrevChannel(self): ! return config.TV_CHANNELS[(self.chan_index-1) % len(config.TV_CHANNELS)][2] --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src config.py,1.73,1.74
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1:/tmp/cvs-serv767/src Modified Files: config.py Log Message: Added a input_num property to the VideoGroup class because it can vary between OS and cards. We default to 0 which is common for the tv tuner in Linux. For BSD this is often 1, for ivtv cards often 4. Index: config.py === RCS file: /cvsroot/freevo/freevo/src/config.py,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** config.py 24 Nov 2003 19:23:07 - 1.73 --- config.py 25 Nov 2003 01:08:11 - 1.74 *** *** 23,26 --- 23,31 # --- # $Log$ + # Revision 1.74 2003/11/25 01:08:11 rshortt + # Added a input_num property to the VideoGroup class because it can vary + # between OS and cards. We default to 0 which is common for the tv tuner in + # Linux. For BSD this is often 1, for ivtv cards often 4. + # # Revision 1.73 2003/11/24 19:23:07 dischi # remove the MOVIE_XXX variables, they are in video/__init__ now *** *** 181,184 --- 186,190 adev:The audio device, such as /dev/dsp. input_type: tuner, composite, svideo, webcam + input_num: The number of this input according to V4L tuner_type: internal (on a v4l device), or external (cable or sat box) tuner_norm: NTSC, PAL, SECAM *** *** 191,195 def __init__(self, vdev='/dev/video', adev='/dev/dsp', input_type='tuner', ! tuner_norm='NTSC', tuner_chanlist='us-cable', tuner_type='internal', tuner_chan=None, recordable=True, desc='Freevo default VideoGroup'): --- 197,201 def __init__(self, vdev='/dev/video', adev='/dev/dsp', input_type='tuner', ! input_num=0, tuner_norm='NTSC', tuner_chanlist='us-cable', tuner_type='internal', tuner_chan=None, recordable=True, desc='Freevo default VideoGroup'): *** *** 199,202 --- 205,209 self.adev = adev self.input_type = input_type + self.input_num = input_num self.tuner_type = tuner_type self.tuner_norm = string.upper(tuner_norm) --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins mplayer.py,1.26.2.2,1.26.2.3
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv3401/src/tv/plugins
Modified Files:
Tag: rob
mplayer.py
Log Message:
Some further fixes and improvements, aldo removed MPLAYER_DEBUG since
ChildApp does this now.
Please test if you can. VideoGroup configuration is still much undocumented
but I am planning to do so. Ping me if you need a quick hand.
To test this you must check it out by:
cvs update -r rob src/tv/plugins/mplayer.py
Index: mplayer.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -C2 -d -r1.26.2.2 -r1.26.2.3
*** mplayer.py 24 Nov 2003 17:16:40 - 1.26.2.2
--- mplayer.py 25 Nov 2003 01:24:12 - 1.26.2.3
***
*** 10,13
--- 10,23
# ---
# $Log$
+ # Revision 1.26.2.3 2003/11/25 01:24:12 rshortt
+ # Some further fixes and improvements, aldo removed MPLAYER_DEBUG since
+ # ChildApp does this now.
+ #
+ # Please test if you can. VideoGroup configuration is still much undocumented
+ # but I am planning to do so. Ping me if you need a quick hand.
+ #
+ # To test this you must check it out by:
+ # cvs update -r rob src/tv/plugins/mplayer.py
+ #
# Revision 1.26.2.2 2003/11/24 17:16:40 rshortt
# Bugfixes.
***
*** 122,196
self.app_mode = 'tv'
self.fc = FreevoChannels()
! def Play(self, mode, tuner_channel, channel_change=0):
!
! tuner_freq = self.fc.chanSet(tuner_channel, app='mplayer')
! if mode == 'tv':
tuner_channel = self.fc.getChannel()
- cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
! # Convert to MPlayer TV setting strings
! norm = 'norm=%s' % cf_norm.upper()
! if os.uname()[0] == 'FreeBSD':
! # XXX fix
! tmp = { 'television':1, 'composite1':0, 'composite2':2,
! 's-video':3}[cf_input.lower()]
! else:
! tmp = { 'television':0, 'composite1':1, 'composite2':2,
! 's-video':3}[cf_input.lower()]
! input = 'input=%s' % tmp
! chanlist = 'chanlist=%s' % cf_clist
! device= 'device=%s' % cf_device
! w, h = config.TV_VIEW_SIZE
! outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
! tvcmd = ('tv:// -tv driver=%s:freq=%s:%s:%s:%s:'
'%s:width=%s:height=%s:%s %s' %
(config.TV_DRIVER, tuner_freq, device, input, norm,
! chanlist, w, h, outfmt, config.TV_OPTS))
!
! # Build the MPlayer command
! args = (config.MPLAYER_NICE, config.MPLAYER_CMD, config.MPLAYER_VO_DEV,
! config.MPLAYER_VO_DEV_OPTS, tvcmd)
!
! if config.MPLAYER_ARGS.has_key('tv'):
! args += (config.MPLAYER_ARGS['tv'],)
!
! mpl = '--prio=%s %s -vo %s%s -fs %s %s -slave' % args
elif mode == 'vcr':
- cf_norm, cf_input, tmp, cf_device = config.VCR_SETTINGS.split()
-
- # Convert to MPlayer TV setting strings
- norm = 'norm=%s' % cf_norm.upper()
- if os.uname()[0] == 'FreeBSD':
- # XXX fix
- tmp = { 'television':1, 'composite1':0, 'composite2':2,
- 's-video':3}[cf_input.lower()]
- else:
- tmp = { 'television':0, 'composite1':1, 'composite2':2,
- 's-video':3}[cf_input.lower()]
- input = 'input=%s' % tmp
- device= 'device=%s' % cf_device
-
- w, h = config.TV_VIEW_SIZE
- outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
-
tvcmd = ('tv:// -tv driver=%s:%s:%s:'
'%s:width=%s:height=%s:%s %s' %
! (config.TV_DRIVER, device, input, norm, w, h, outfmt,
config.TV_OPTS))
!
! args = (config.MPLAYER_NICE, config.MPLAYER_CMD, config.MPLAYER_VO_DEV,
! config.MPLAYER_VO_DEV_OPTS, tvcmd)
!
! if config.MPLAYER_ARGS.has_key('tv'):
! args += (config.MPLAYER_ARGS['tv'],)
!
! mpl = '--prio=%s %s -vo %s%s -fs %s %s -slave' % args
else:
--- 132,167
self.app_mode = 'tv'
self.fc = FreevoChannels()
+ self.current_vg = None
! def Play(self, mode, tuner_channel=None, channel_change=0):
! if not tuner_channel:
tuner_channel = self.fc.getChannel()
+
+ tuner_freq = self.fc.chanSet(tuner_channel, app='mplayer')
+ vg = self.current_vg = self.fc.getVideoGroup(tuner_channel)
! # Convert
[Freevo-cvslog] freevo/src config.py,1.71,1.72
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1:/tmp/cvs-serv31613/src Modified Files: config.py Log Message: Make sure VideoGroup gets the norm as upper case. Index: config.py === RCS file: /cvsroot/freevo/freevo/src/config.py,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** config.py 23 Nov 2003 18:56:33 - 1.71 --- config.py 23 Nov 2003 19:12:22 - 1.72 *** *** 23,26 --- 23,29 # --- # $Log$ + # Revision 1.72 2003/11/23 19:12:22 rshortt + # Make sure VideoGroup gets the norm as upper case. + # # Revision 1.71 2003/11/23 18:56:33 rshortt # Cleanup VideoGroup class a bit. *** *** 99,103 #endif ! import sys, os, time, re import setup_freevo import traceback --- 102,106 #endif ! import sys, os, time, re, string import setup_freevo import traceback *** *** 194,198 self.input_type = input_type self.tuner_type = tuner_type ! self.tuner_norm = tuner_norm self.tuner_chanlist = tuner_chanlist self.tuner_chan = tuner_chan --- 197,201 self.input_type = input_type self.tuner_type = tuner_type ! self.tuner_norm = string.upper(tuner_norm) self.tuner_chanlist = tuner_chanlist self.tuner_chan = tuner_chan --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo_config.py,1.288,1.289
Update of /cvsroot/freevo/freevo In directory sc8-pr-cvs1:/tmp/cvs-serv31690 Modified Files: freevo_config.py Log Message: Adding a default VIDEO_GROUPS which has only one entry, with already configured values. If the user changes the video or audio device in local_conf.py they will have to change VIDEO_GROUPS. This will be nasty for users to configure. Suggestions welcome! This is also why I would like to move to an XML based config file and some config frontend tools. Index: freevo_config.py === RCS file: /cvsroot/freevo/freevo/freevo_config.py,v retrieving revision 1.288 retrieving revision 1.289 diff -C2 -d -r1.288 -r1.289 *** freevo_config.py23 Nov 2003 18:47:54 - 1.288 --- freevo_config.py23 Nov 2003 19:16:58 - 1.289 *** *** 1129,1132 --- 1129,1147 + # VIDEO_GROUPS is a new setting to handle multiple arbitrary groups of devices + # for viewing or recording. It will be possible to have different Freevo + # channels use different Video Groups. + + VIDEO_GROUPS = [ + VideoGroup(vdev=TV_DEVICE, +adev=AUDIO_DEVICE, +input_type='tuner', +tuner_norm=CONF.tv, +tuner_chanlist=CONF.chanlist, +desc='Default Video Group', +recordable=True), + ] + + # # TV Channels. This list contains a mapping from the displayed channel name --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins mplayer.py,1.23,1.24
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv6268
Modified Files:
mplayer.py
Log Message:
Move some code into src/tv/channels.py and also make use of Freevo's
frequency tables (and custom frequencies).
This plugin indirectly makes use of the new VIDEO_GROUPS config item.
Please test. I don't have the setup to test this myself.
Index: mplayer.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/mplayer.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** mplayer.py 6 Nov 2003 06:08:38 - 1.23
--- mplayer.py 23 Nov 2003 19:53:01 - 1.24
***
*** 10,13
--- 10,21
# ---
# $Log$
+ # Revision 1.24 2003/11/23 19:53:01 rshortt
+ # Move some code into src/tv/channels.py and also make use of Freevo's
+ # frequency tables (and custom frequencies).
+ #
+ # This plugin indirectly makes use of the new VIDEO_GROUPS config item.
+ #
+ # Please test. I don't have the setup to test this myself.
+ #
# Revision 1.23 2003/11/06 06:08:38 krister
# Added testcode for viewing the VCR/Composite1 input on the TV card
***
*** 72,76
import childapp # Handle child applications
import tv.epg_xmltv as epg # The Electronic Program Guide
!
import plugin
--- 80,85
import childapp # Handle child applications
import tv.epg_xmltv as epg # The Electronic Program Guide
! from tv.channels import FreevoChannels
!
import plugin
***
*** 106,153
self.tuner_chidx = 0# Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
- def TunerSetChannel(self, tuner_channel):
- for pos in range(len(config.TV_CHANNELS)):
- channel = config.TV_CHANNELS[pos]
- if channel[2] == tuner_channel:
- self.tuner_chidx = pos
- return
- print 'ERROR: Cannot find tuner channel %s in the TV channel listing' %
tuner_channel
- self.tuner_chidx = 0
-
-
- def TunerGetChannelInfo(self):
- '''Get program info for the current channel'''
-
- tuner_id = config.TV_CHANNELS[self.tuner_chidx][2]
- chan_name = config.TV_CHANNELS[self.tuner_chidx][1]
- chan_id = config.TV_CHANNELS[self.tuner_chidx][0]
-
- channels = epg.get_guide().GetPrograms(start=time.time(),
-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))
- ts = '(%s-%s)' % (start_s, stop_s)
- prog_info = '%s %s' % (ts, channels[0].programs[0].title)
- else:
- prog_info = 'No info'
-
- return tuner_id, chan_name, prog_info
-
-
- def TunerGetChannel(self):
- return config.TV_CHANNELS[self.tuner_chidx][2]
-
-
- def TunerNextChannel(self):
- self.tuner_chidx = (self.tuner_chidx+1) % len(config.TV_CHANNELS)
-
-
- def TunerPrevChannel(self):
- self.tuner_chidx = (self.tuner_chidx-1) % len(config.TV_CHANNELS)
-
def Play(self, mode, tuner_channel=None, channel_change=0):
--- 115,121
self.tuner_chidx = 0# Current channel, index into config.TV_CHANNELS
self.app_mode = 'tv'
+ self.fc = FreevoChannels()
def Play(self, mode, tuner_channel=None, channel_change=0):
***
*** 155,164
try:
! self.TunerSetChannel(tuner_channel)
except ValueError:
pass
if mode == 'tv':
! tuner_channel = self.TunerGetChannel()
cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
--- 123,133
try:
! self.fc.chanSet(tuner_channel)
except ValueError:
pass
if mode == 'tv':
! tuner_freq = self.fc.chanSet(app='mplayer')
! tuner_channel = self.fc.getChannel()
cf_norm, cf_input, cf_clist, cf_device = config.TV_SETTINGS.split()
***
*** 180,186
outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
! tvcmd = ('tv://%s -tv driver=%s:%s:%s:%s:'
'%s:width=%s:height=%s:%s %s' %
! (tuner_channel, config.TV_DRIVER, device, input, norm,
chanlist, w, h, outfmt, config.TV_OPTS))
# Build the MPlayer command
--- 149,157
outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
!
! tvcmd = ('tv://%s -tv driver
[Freevo-cvslog] freevo/src/tv/plugins ivtv_record.py,1.14,1.15
Update of /cvsroot/freevo/freevo/src/tv/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv6937 Modified Files: ivtv_record.py Log Message: Changes to use src/tv/channels.py and VIDEO_GROUPS. Index: ivtv_record.py === RCS file: /cvsroot/freevo/freevo/src/tv/plugins/ivtv_record.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ivtv_record.py 15 Oct 2003 12:49:53 - 1.14 --- ivtv_record.py 23 Nov 2003 19:55:27 - 1.15 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.15 2003/11/23 19:55:27 rshortt + # Changes to use src/tv/channels.py and VIDEO_GROUPS. + # # Revision 1.14 2003/10/15 12:49:53 rshortt # Patch from Eirik Meland that stops recording when you remove a recording *** *** 66,69 --- 69,74 import plugin + from tv.channels import FreevoChannels + DEBUG = config.DEBUG *** *** 131,134 --- 136,142 print 'Record_Thread::run: started recording' + fc = FreevoChannels() + print 'CHAN: %s' % fc.getChannel() + tv_lock_file = config.FREEVO_CACHEDIR + '/record' open(tv_lock_file, 'w').close() *** *** 145,149 print 'Setting Channel to %s' % self.prog.tunerid ! v.setchannel(self.prog.tunerid) if DEBUG: v.print_settings() --- 153,157 print 'Setting Channel to %s' % self.prog.tunerid ! fc.chanSet(str(self.prog.tunerid)) if DEBUG: v.print_settings() --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins irsend_generic.py,NONE,1.1
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv13501
Added Files:
irsend_generic.py
Log Message:
This is a plugin for sending IR commands to an external tuner. You can
specify your irsend command when you plugin.activate.
This is totally untested as irsend doesn't work with my receiver. If you
would like to use this give it a try and notify of any problems or modify
it to work correctly. It is now merely a proof of concept.
--- NEW FILE: irsend_generic.py ---
#if 0 /*
# ---
# irsend_generic.py - Send commands to an external tv receiver using a
# shell command like irsend from Lirc.
# ---
# $Id: irsend_generic.py,v 1.1 2003/11/23 20:32:05 rshortt Exp $
#
# Notes: Plugin wrapper for irsend or any other remote controll command.
#
# Todo:
#
# ---
# $Log: irsend_generic.py,v $
# Revision 1.1 2003/11/23 20:32:05 rshortt
# This is a plugin for sending IR commands to an external tuner. You can
# specify your irsend command when you plugin.activate.
#
# This is totally untested as irsend doesn't work with my receiver. If you
# would like to use this give it a try and notify of any problems or modify
# it to work correctly. It is now merely a proof of concept.
#
#
#
# ---
# Freevo - A Home Theater PC framework
# Copyright (C) 2003 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of MER-
# CHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# --- */
#endif
import os, sys, time, string
import plugin
class PluginInterface(plugin.Plugin):
Use this plugin if you need to use Lirc's irsend (or similar) command
to tell an external tuner to change the channel.
Example usage (local_conf.py):
plugin_external_tuner = plugin.activate('tv.irsend_echostar',
args=('/usr/bin/irsend SEND_ONCE remote_name', ))
Where remote_name is the name of the remote you are using to send codes
with in lircd.conf.
def __init__(self, command):
plugin.Plugin.__init__(self)
self.command = command
plugin.register(self, 'EXTERNAL_TUNER')
def setChannel(self, chan):
chan = str(chan)
digits = len(chan)
chan_args = ''
for i in range(digits):
chan_args += chan[i] + ' '
self.transmitSignal(chan_args)
def transmitButton(self, button):
print 'sending button: %s\n' % button
self.transmitSignal(code)
def transmitSignal(self, code):
sendcmd = '%s %s' % (self.command, code)
os.system(sendcmd)
---
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv channels.py,1.3,1.4
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv16114/src/tv Modified Files: channels.py Log Message: Dumb typo. Index: channels.py === RCS file: /cvsroot/freevo/freevo/src/tv/channels.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** channels.py 23 Nov 2003 19:21:49 - 1.3 --- channels.py 23 Nov 2003 20:46:07 - 1.4 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.4 2003/11/23 20:46:07 rshortt + # Dumb typo. + # # Revision 1.3 2003/11/23 19:21:49 rshortt # Add getChannelInfo, taken from a method of the mplayer tv plugin. I have *** *** 57,61 import config, plugin import tv.freq, tv.v4l2 ! impot epg_xmltv DEBUG = config.DEBUG --- 60,64 import config, plugin import tv.freq, tv.v4l2 ! import epg_xmltv DEBUG = config.DEBUG --- This SF.net email is sponsored by: SF.net Giveback Program. Does SourceForge.net help you be more productive? Does it help you create better code? SHARE THE LOVE, and help us help YOU! Click Here: http://sourceforge.net/donate/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo freevo,1.96,1.97
Update of /cvsroot/freevo/freevo In directory sc8-pr-cvs1:/tmp/cvs-serv10582 Modified Files: freevo Log Message: Bugfix for the new runtime. Index: freevo === RCS file: /cvsroot/freevo/freevo/freevo,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** freevo 7 Nov 2003 15:47:25 - 1.96 --- freevo 9 Nov 2003 13:29:34 - 1.97 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.97 2003/11/09 13:29:34 rshortt + # Bugfix for the new runtime. + # # Revision 1.96 2003/11/07 15:47:25 dischi # change dir for runtime (may not work for all helpers) *** *** 158,162 # set runapp export RUNAPP=./runtime/runapp ! PYTHON=python else # runapp only works in the Freevo directory --- 161,165 # set runapp export RUNAPP=./runtime/runapp ! PYTHON=./runtime/apps/freevo_python else # runapp only works in the Freevo directory --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/runtime Makefile,1.20,1.21
Update of /cvsroot/freevo/freevo/runtime
In directory sc8-pr-cvs1:/tmp/cvs-serv11399/runtime
Modified Files:
Makefile
Log Message:
Some pygphoto and gphoto plugin fixes.
Index: Makefile
===
RCS file: /cvsroot/freevo/freevo/runtime/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile31 Oct 2003 20:13:01 - 1.20
--- Makefile9 Nov 2003 16:36:46 - 1.21
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.21 2003/11/09 16:36:46 rshortt
+ # Some pygphoto and gphoto plugin fixes.
+ #
# Revision 1.20 2003/10/31 20:13:01 rshortt
# Changes for the 1.4 runtime and add runtime_release target.
***
*** 208,212
cp -a lib/python2.3/site-packages/{Numeric,Numeric.pth} tmp
cp -a lib/python2.3/site-packages/{PIL,PIL.pth,_xmlplus,aomodule.so} tmp
! cp -a lib/python2.3/site-packages/{ogg,pygame,pygphoto.so} tmp
cp -a lib/python2.3/site-packages/{pylircmodule.so,fchksum.so,pylcd.py} tmp
cp -a lib/python2.3/site-packages/{mmpython,twisted} tmp
--- 211,215
cp -a lib/python2.3/site-packages/{Numeric,Numeric.pth} tmp
cp -a lib/python2.3/site-packages/{PIL,PIL.pth,_xmlplus,aomodule.so} tmp
! cp -a lib/python2.3/site-packages/{ogg,pygame,_pygphoto.so,pygphoto.py} tmp
cp -a lib/python2.3/site-packages/{pylircmodule.so,fchksum.so,pylcd.py} tmp
cp -a lib/python2.3/site-packages/{mmpython,twisted} tmp
---
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/image/plugins gphoto.py,1.4,1.5
Update of /cvsroot/freevo/freevo/src/image/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv11399/src/image/plugins Modified Files: gphoto.py Log Message: Some pygphoto and gphoto plugin fixes. Index: gphoto.py === RCS file: /cvsroot/freevo/freevo/src/image/plugins/gphoto.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gphoto.py 13 Sep 2003 10:08:22 - 1.4 --- gphoto.py 9 Nov 2003 16:36:46 - 1.5 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.5 2003/11/09 16:36:46 rshortt + # Some pygphoto and gphoto plugin fixes. + # # Revision 1.4 2003/09/13 10:08:22 dischi # i18n support *** *** 47,51 from item import Item import pygame ! import _pygphoto as pygphoto import cStringIO import image.viewer --- 50,54 from item import Item import pygame ! import pygphoto import cStringIO import image.viewer --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/WIP/Thomas/pygphoto Makefile,1.1,1.2
Update of /cvsroot/freevo/freevo/WIP/Thomas/pygphoto In directory sc8-pr-cvs1:/tmp/cvs-serv11598 Modified Files: Makefile Log Message: I think it is safe to default to python 2.3 now since that is what the runtime ships with and what most devs use. Index: Makefile === RCS file: /cvsroot/freevo/freevo/WIP/Thomas/pygphoto/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile21 Jun 2003 19:16:23 - 1.1 --- Makefile9 Nov 2003 16:38:38 - 1.2 *** *** 10,14 #CFLAGS = -O2 -Wall ! XLIBS = -L/usr/lib/python2.2 XINC = -I/usr/include -I/usr/include/gphoto2 --- 10,14 #CFLAGS = -O2 -Wall ! XLIBS = -L/usr/lib/python2.3 XINC = -I/usr/include -I/usr/include/gphoto2 *** *** 19,23 wrapper: ! $(CC) $(CFLAGS) -c pygphoto_wrap.c -I/usr/include/gphoto2 -I/usr/include/python2.2 link: --- 19,23 wrapper: ! $(CC) $(CFLAGS) -c pygphoto_wrap.c -I/usr/include/gphoto2 -I/usr/include/python2.3 link: --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/runtime Makefile,1.21,1.22
Update of /cvsroot/freevo/freevo/runtime In directory sc8-pr-cvs1:/tmp/cvs-serv11432 Modified Files: Makefile Log Message: Runtime fixes. Index: Makefile === RCS file: /cvsroot/freevo/freevo/runtime/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile9 Nov 2003 16:36:46 - 1.21 --- Makefile9 Nov 2003 19:35:46 - 1.22 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.22 2003/11/09 19:35:46 rshortt + # Runtime fixes. + # # Revision 1.21 2003/11/09 16:36:46 rshortt # Some pygphoto and gphoto plugin fixes. *** *** 99,102 --- 102,107 include package_list.mk + RUNTIME_VERSION=0.2 + COPY_BASE=`pwd` *** *** 143,148 runtime_release: runapp_static copy ! rm -f runtime.tar.gz ! tar zcvhf runtime.tar.gz runapp apps lib dll preloads # Copy the libraries, programs etc to this directory --- 148,155 runtime_release: runapp_static copy ! rm -f ../freevo-runtime-$(RUNTIME_VERSION).tar.gz ! cd ..; \ ! tar zcvhf freevo-runtime-$(RUNTIME_VERSION).tar.gz runtime/runapp runtime/apps runtime/lib runtime/dll runtime/preloads ; \ ! cd - # Copy the libraries, programs etc to this directory --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/runtime/src runapp.c,1.1,1.2
Update of /cvsroot/freevo/freevo/runtime/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6055
Modified Files:
runapp.c
Log Message:
Remove the check for staticly linked apps since it was broken and we don't
need it any more.
Index: runapp.c
===
RCS file: /cvsroot/freevo/freevo/runtime/src/runapp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** runapp.c22 Aug 2003 17:47:58 - 1.1
--- runapp.c10 Nov 2003 01:15:36 - 1.2
***
*** 62,66
int newprio;
int got_runtime;
- int static_linked = 0;
int use_preloads = 0; /* Full runtime preloads */
struct exec exec;
--- 62,65
***
*** 158,196
if (strstr (av[ac_idx], runtime/apps/) != (char *) NULL) {
! /* lets see is this app is staticly linked */
! /* this check is taken from lddlibc4.c of glibc-2.2.5 */
!
! /* First see whether this is really an a.out binary. */
! fp = fopen (av[ac_idx], rb);
! if (fp == NULL) {
! LOG (cannot open `%s', av[1]);
! exit (1);
! }
!
! /* Read the program header. */
! if (fread (exec, sizeof exec, 1, fp) 1) {
! LOG (cannot read header from `%s', av[1]);
! }
! /* Test for the magic numbers. */
! else if (N_MAGIC (exec) != ZMAGIC N_MAGIC (exec) != QMAGIC
! N_MAGIC (exec) != OMAGIC) {
! LOG (Looks like a staticly linked executable);
! static_linked = 1;
! }
!
! /* We don't need the file open anymore. */
! fclose (fp);
!
! if(!static_linked) {
! /* Yes, so the executable to start is the freevo_loader. */
! newav[newac++] = ./runtime/dll/freevo_loader;
! use_preloads = 1;
! LOG (Runtime app, must use preloads);
! }
! else {
! /* Just a plain old app. It will be copied to newav[] below */
! LOG (Static app, no preloads);
! }
} else {
/* Just a plain old app. It will be copied to newav[] below */
--- 157,165
if (strstr (av[ac_idx], runtime/apps/) != (char *) NULL) {
! /* Yes, so the executable to start is the freevo_loader. */
! newav[newac++] = ./runtime/dll/freevo_loader;
! use_preloads = 1;
! LOG (Runtime app, must use preloads);
} else {
/* Just a plain old app. It will be copied to newav[] below */
***
*** 201,205
/* Check if LD_PRELOAD needs to be set to the full runtime preloads */
! if (use_preloads !static_linked) {
char *pPreloads;
--- 170,174
/* Check if LD_PRELOAD needs to be set to the full runtime preloads */
! if (use_preloads) {
char *pPreloads;
---
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/runtime Makefile,1.23,1.24
Update of /cvsroot/freevo/freevo/runtime In directory sc8-pr-cvs1:/tmp/cvs-serv6265 Modified Files: Makefile Log Message: Incriment runtime version. Index: Makefile === RCS file: /cvsroot/freevo/freevo/runtime/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile10 Nov 2003 01:09:42 - 1.23 --- Makefile10 Nov 2003 01:17:04 - 1.24 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.24 2003/11/10 01:17:04 rshortt + # Incriment runtime version. + # # Revision 1.23 2003/11/10 01:09:42 rshortt # Turn the runapp's DEBUG on. *** *** 105,109 include package_list.mk ! RUNTIME_VERSION=0.2 COPY_BASE=`pwd` --- 108,112 include package_list.mk ! RUNTIME_VERSION=0.3 COPY_BASE=`pwd` --- This SF.Net email sponsored by: ApacheCon 2003, 16-19 November in Las Vegas. Learn firsthand the latest developments in Apache, PHP, Perl, XML, Java, MySQL, WebDAV, and more! http://www.apachecon.com/ ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/runtime Makefile,1.19,1.20
Update of /cvsroot/freevo/freevo/runtime
In directory sc8-pr-cvs1:/tmp/cvs-serv24794
Modified Files:
Makefile
Log Message:
Changes for the 1.4 runtime and add runtime_release target.
Index: Makefile
===
RCS file: /cvsroot/freevo/freevo/runtime/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile6 Aug 2003 00:34:45 - 1.19
--- Makefile31 Oct 2003 20:13:01 - 1.20
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.20 2003/10/31 20:13:01 rshortt
+ # Changes for the 1.4 runtime and add runtime_release target.
+ #
# Revision 1.19 2003/08/06 00:34:45 rshortt
# Adding pylcd.
***
*** 101,105
TAR2=tar jxvf
! PREFIX=$(COPY_BASE)/build
COPY_BASE=$(PREFIX)
--- 104,108
TAR2=tar jxvf
! PREFIX=/usr
COPY_BASE=$(PREFIX)
***
*** 107,112
PYBIN=/usr/bin/python
! LIRCLIB=/opt/lirc/lib
! LIRCINC=/opt/lirc/include
.PHONY: copy build clean src copy_libdeps
--- 110,117
PYBIN=/usr/bin/python
! LIRCLIB=/usr/local/lib
! LIRCINC=/usr/local/include
!
! LOGDIR=/var/log/freevo
.PHONY: copy build clean src copy_libdeps
***
*** 115,121
--- 120,146
# There is no default target, you gotta know what you're doing :-)
all:
+ @echo
@echo Please see the Makefile source and the Wiki for more info!
+ @echo
+ @echo Right now this file is only used as a tool to release the binary
+ @echo runtime.
+ @echo
+
+
+ runapp_static: src/runapp.c
+ rm -f runapp
+ $(CC) $(CFLAGS) -static -o runapp src/runapp.c -DRUNAPP_LOGDIR=\$(LOGDIR)\
+ strip runapp
+
+ runapp_dyn: src/runapp.c
+ rm -f runapp
+ $(CC) $(CFLAGS) -o runapp src/runapp.c -DRUNAPP_LOGDIR=\$(LOGDIR)\
+ strip runapp
+ runtime_release: runapp_static copy
+ rm -f runtime.tar.gz
+ tar zcvhf runtime.tar.gz runapp apps lib dll preloads
+
# Copy the libraries, programs etc to this directory
# There is no dependency checking, the libs are just copied
***
*** 124,129
# Python programs in lib/ have their execute flag removed since
# RPM building chokes on them.
! copy: python_copy mplayer_copy mplayer_fonts_copy cdparanoia_copy \
! lame_copy jpegtran_copy copy_libdeps
find lib -name *.so -exec strip {} \;
find dll -name *.so* -exec strip {} \;
--- 149,153
# Python programs in lib/ have their execute flag removed since
# RPM building chokes on them.
! copy: python_copy jpegtran_copy matroxset_copy copy_libdeps
find lib -name *.so -exec strip {} \;
find dll -name *.so* -exec strip {} \;
***
*** 153,164
# easy killing in the main startscript 'freevo'
copy_libdeps:
-mkdir -p dll
python copy_libdeps.py
mv dll/ld-linux.so.2 dll/freevo_loader
#
! # Python 2.2.2
#
--- 177,191
# easy killing in the main startscript 'freevo'
copy_libdeps:
+ -rm -rf dll
-mkdir -p dll
python copy_libdeps.py
mv dll/ld-linux.so.2 dll/freevo_loader
+ cp $(PREFIX)/lib/i486/libcrypto.so.0.9.7 dll/
+ cp $(PREFIX)/lib/i486/libssl.so.0.9.7 dll/
#
! # Python 2.3
#
***
*** 171,191
-mkdir -p lib
-mkdir -p apps
! cp -a /usr/lib/python2.2 lib
find . -name *.pyo -exec rm {} \;
find . -name *.pyc -exec rm {} \;
! rm -rf lib/python2.2/config
! rm -rf lib/python2.2/lib-tk
! rm -rf lib/python2.2/lib-old
! rm -rf lib/python2.2/test
-mkdir -p tmp
! cp -a lib/python2.2/site-packages/{CDDB.py,DiscID.py,Numeric,Numeric.pth} tmp
! cp -a lib/python2.2/site-packages/{PIL,PIL.pth,_xmlplus,aomodule.so} tmp
! cp -a lib/python2.2/site-packages/{cdrom.so,mx,ogg,pygame,pygphoto.so} tmp
! cp -a lib/python2.2/site-packages/{pylircmodule.so,fchksum.so,pylcd.py} tmp
! cp -a lib/python2.2/site-packages/{_xmms.so,xmms.py} tmp
! cp -a lib/python2.2/site-packages/{mmpython,twisted,pyshift.so} tmp
! rm -rf lib/python2.2/site-packages
! mv tmp lib/python2.2/site-packages
! cp -a /usr/bin/python2.2 apps/freevo_python
--- 198,217
-mkdir -p lib
-mkdir -p apps
! cp -a /usr/lib/python2.3 lib
find . -name *.pyo -exec rm {} \;
find . -name *.pyc -exec rm {} \;
! rm -rf lib/python2.3/config
! rm -rf lib
[Freevo-cvslog] freevo/src/games game.py,1.11,1.12
Update of /cvsroot/freevo/freevo/src/games
In directory sc8-pr-cvs1:/tmp/cvs-serv6242
Modified Files:
game.py
Log Message:
Bugfix for xmame.x11. Since our new process code xmame will go defunct after
exit and Freevo will hang. This used to happen with xmame.SDL and the
wait() call I am removing was the solution. I hope that is no longer needed
without runapp.
Index: game.py
===
RCS file: /cvsroot/freevo/freevo/src/games/game.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** game.py 13 Sep 2003 10:08:22 - 1.11
--- game.py 23 Oct 2003 00:30:42 - 1.12
***
*** 10,13
--- 10,19
# ---
# $Log$
+ # Revision 1.12 2003/10/23 00:30:42 rshortt
+ # Bugfix for xmame.x11. Since our new process code xmame will go defunct after
+ # exit and Freevo will hang. This used to happen with xmame.SDL and the
+ # wait() call I am removing was the solution. I hope that is no longer needed
+ # without runapp.
+ #
# Revision 1.11 2003/09/13 10:08:22 dischi
# i18n support
***
*** 168,172
osd.stopdisplay()
self.app = GameApp(self.command)
! self.app.child.wait()
if config.OSD_SDL_EXEC_AFTER_STARTUP:
--- 174,184
osd.stopdisplay()
self.app = GameApp(self.command)
!
! while self.mode == 'play' and self.app.isAlive():
! time.sleep(0.5)
!
! print('Game_Thread::run: GAME OVER')
!
! self.app.kill()
if config.OSD_SDL_EXEC_AFTER_STARTUP:
---
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv program_display.py,1.20,1.21
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv12741/src/tv Modified Files: program_display.py Log Message: Fix a crash when no recordserver is available. Index: program_display.py === RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** program_display.py 21 Oct 2003 15:11:52 - 1.20 --- program_display.py 22 Oct 2003 02:45:02 - 1.21 *** *** 10,13 --- 10,16 #--- # $Log$ + # Revision 1.21 2003/10/22 02:45:02 rshortt + # Fix a crash when no recordserver is available. + # # Revision 1.20 2003/10/21 15:11:52 outlyer # Remove a stray print... this was probably for debugging. *** *** 319,322 --- 322,327 vertical_expansion) + self.result = False + (self.server_available, msg) = record_client.connectionTest() if not self.server_available: *** *** 381,385 def eventhandler(self, event, menuw=None): ! if not self.result: self.destroy() return --- 386,390 def eventhandler(self, event, menuw=None): ! if not self.result or not self.server_available: self.destroy() return --- This SF.net email is sponsored by OSDN developer relations Here's your chance to show off your extensive product knowledge We want to know what you know. Tell us and you have a chance to win $100 http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54 ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src rc.py,1.24,1.25
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1:/tmp/cvs-serv16497/src Modified Files: rc.py Log Message: Added a subscribe method so that you can get a callback when events are posted. Also rework __init__ sligntly. Index: rc.py === RCS file: /cvsroot/freevo/freevo/src/rc.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** rc.py 14 Oct 2003 17:40:11 - 1.24 --- rc.py 18 Oct 2003 21:23:38 - 1.25 *** *** 10,13 --- 10,17 # --- # $Log$ + # Revision 1.25 2003/10/18 21:23:38 rshortt + # Added a subscribe method so that you can get a callback when events are + # posted. Also rework __init__ sligntly. + # # Revision 1.24 2003/10/14 17:40:11 mikeruelle # enable network remote to work. *** *** 62,71 _singleton = None ! def get_singleton(): global _singleton # One-time init if _singleton == None: ! _singleton = util.SynchronizedObject(RemoteControl()) return _singleton --- 66,75 _singleton = None ! def get_singleton(**kwargs): global _singleton # One-time init if _singleton == None: ! _singleton = util.SynchronizedObject(RemoteControl(**kwargs)) return _singleton *** *** 94,100 class RemoteControl: ! def __init__(self, port=config.REMOTE_CONTROL_PORT): ! self.pylirc = PYLIRC ! self.osd= osd.get_singleton() if self.pylirc: try: --- 98,118 class RemoteControl: ! def __init__(self, use_pylirc=1, use_netremote=1): ! self.osd = osd.get_singleton() ! ! self.use_pylirc = use_pylirc ! if self.use_pylirc: ! self.pylirc = PYLIRC ! else: ! # do not use pylirc if we know we don't want it ! self.pylirc = 0 ! ! if use_netremote and config.ENABLE_NETWORK_REMOTE: ! port = config.REMOTE_CONTROL_PORT ! else: ! port = 0 ! use_netremote = 0 ! self.use_netremote = use_netremote ! if self.pylirc: try: *** *** 107,111 print 'WARNING: %s not found!' % config.LIRCRC self.pylirc = 0 ! if config.ENABLE_NETWORK_REMOTE: self.port = port self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) --- 125,130 print 'WARNING: %s not found!' % config.LIRCRC self.pylirc = 0 ! ! if self.use_netremote: self.port = port self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) *** *** 120,123 --- 139,143 self.previous_code = None; self.repeat_count = 0 + self.event_callback = None # Take into consideration only 1 event out of ``modulo'' *** *** 148,151 --- 168,174 self.queue += [ e ] + if self.event_callback: + self.event_callback() + def key_event_mapper(self, key): if not key: *** *** 217,221 return e ! if config.ENABLE_NETWORK_REMOTE: try: data = self.sock.recv(100) --- 240,244 return e ! if self.use_netremote: try: data = self.sock.recv(100) *** *** 230,231 --- 253,261 return (None, None) + + def subscribe(self, event_callback=None): + # Only one thing can call poll() so we only handle one subscriber. + if not event_callback: return + + self.event_callback = event_callback + --- This SF.net email sponsored by: Enterprise Linux Forum Conference Expo The Event For Linux Datacenter Solutions Strategies in The Enterprise Linux in the Boardroom; in the Front Office; in the Server Room http://www.enterpriselinuxforum.com ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.12,1.13
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1:/tmp/cvs-serv18181/src/helpers Modified Files: recordserver.py Log Message: Subscribe to events and poll them from a callback method. Index: recordserver.py === RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** recordserver.py 18 Oct 2003 08:33:36 - 1.12 --- recordserver.py 18 Oct 2003 21:33:33 - 1.13 *** *** 7,10 --- 7,13 # --- # $Log$ + # Revision 1.13 2003/10/18 21:33:33 rshortt + # Subscribe to events and poll them from a callback method. + # # Revision 1.12 2003/10/18 08:33:36 dischi # do not restart if the server crashed in 10 secs *** *** 91,95 #endif ! import sys, string, random, time, os, re from twisted.web import xmlrpc, server --- 94,98 #endif ! import sys, string, random, time, os, re, popen2 from twisted.web import xmlrpc, server *** *** 100,103 --- 103,110 import config #config must always be the first freeevo module imported + + import rc + rc_object = rc.get_singleton(use_pylirc=0, use_netremote=0) + from tv.record_types import TYPES_VERSION from tv.record_types import ScheduledRecordings *** *** 108,111 --- 115,120 import plugin + from event import * + # We won't be needing LD_PRELOAD. os.environ['LD_PRELOAD'] = '' *** *** 722,725 --- 731,747 + def eventNotice(self): + print 'RECORDSERVER GOT EVENT NOTICE' + + event, event_repeat_count = rc_object.poll() + + if event and event == OS_EVENT_POPEN2: + print 'popen2 %s' % event.arg[1] + event.arg[0].child = popen2.Popen3(event.arg[1], 1, 100) + else: + print 'not handling event %s' % str(event) + return + + def main(): app = Application(RecordServer) *** *** 727,730 --- 749,753 app.listenTCP(config.RECORD_SERVER_PORT, server.Site(rs)) rs.startMinuteCheck() + rc_object.subscribe(rs.eventNotice) app.run(save=0) --- This SF.net email sponsored by: Enterprise Linux Forum Conference Expo The Event For Linux Datacenter Solutions Strategies in The Enterprise Linux in the Boardroom; in the Front Office; in the Server Room http://www.enterpriselinuxforum.com ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.13,1.14
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1:/tmp/cvs-serv6546/src/helpers Modified Files: recordserver.py Log Message: Calling popen from the main loop now but signals still aren't getting thgough. Index: recordserver.py === RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** recordserver.py 18 Oct 2003 21:33:33 - 1.13 --- recordserver.py 19 Oct 2003 12:46:30 - 1.14 *** *** 7,10 --- 7,13 # --- # $Log$ + # Revision 1.14 2003/10/19 12:46:30 rshortt + # Calling popen from the main loop now but signals still aren't getting thgough. + # # Revision 1.13 2003/10/18 21:33:33 rshortt # Subscribe to events and poll them from a callback method. *** *** 94,98 #endif ! import sys, string, random, time, os, re, popen2 from twisted.web import xmlrpc, server --- 97,101 #endif ! import sys, string, random, time, os, re from twisted.web import xmlrpc, server *** *** 114,117 --- 117,121 import tv.tv_util import plugin + import util.popen3 from event import * *** *** 734,742 print 'RECORDSERVER GOT EVENT NOTICE' event, event_repeat_count = rc_object.poll() if event and event == OS_EVENT_POPEN2: ! print 'popen2 %s' % event.arg[1] ! event.arg[0].child = popen2.Popen3(event.arg[1], 1, 100) else: print 'not handling event %s' % str(event) --- 738,754 print 'RECORDSERVER GOT EVENT NOTICE' + # Use callLater so that handleEvents will get called the next time + # through the main loop. + reactor.callLater(0, self.handleEvents) + + + def handleEvents(self): + print 'RECORDSERVER HANDLING EVENT' + event, event_repeat_count = rc_object.poll() if event and event == OS_EVENT_POPEN2: ! print 'popen %s' % event.arg[1] ! event.arg[0].child = util.popen3.Popen3(event.arg[1]) else: print 'not handling event %s' % str(event) --- This SF.net email sponsored by: Enterprise Linux Forum Conference Expo The Event For Linux Datacenter Solutions Strategies in The Enterprise Linux in the Boardroom; in the Front Office; in the Server Room http://www.enterpriselinuxforum.com ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util popen3.py,1.5,1.6
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv4831/src/util
Modified Files:
popen3.py
Log Message:
Oops.
Index: popen3.py
===
RCS file: /cvsroot/freevo/freevo/src/util/popen3.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** popen3.py 19 Oct 2003 12:41:13 - 1.5
--- popen3.py 19 Oct 2003 12:42:19 - 1.6
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.6 2003/10/19 12:42:19 rshortt
+ # Oops.
+ #
# Revision 1.5 2003/10/19 12:41:13 rshortt
# in waitpid handle recordserver like main.
***
*** 101,105
# do not use this for the main thread
- print 'DEBUG: %s' % traceback.extract_stack()
if traceback.extract_stack()[0][0].find('thread') == -1:
return Popen4(cmd, cwd=cwd)
--- 104,107
---
This SF.net email sponsored by: Enterprise Linux Forum Conference Expo
The Event For Linux Datacenter Solutions Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; in the Server Room
http://www.enterpriselinuxforum.com
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.14,1.15
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1:/tmp/cvs-serv21593/src/helpers Modified Files: recordserver.py Log Message: Added OS_EVENT_WAITPID event for popen3.waitpid() to post so that recordserver can pick it up and wait on its own child. Child processes from recordserver now get signals and clean up properly. Index: recordserver.py === RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** recordserver.py 19 Oct 2003 12:46:30 - 1.14 --- recordserver.py 19 Oct 2003 14:19:44 - 1.15 *** *** 7,10 --- 7,15 # --- # $Log$ + # Revision 1.15 2003/10/19 14:19:44 rshortt + # Added OS_EVENT_WAITPID event for popen3.waitpid() to post so that recordserver + # can pick it up and wait on its own child. Child processes from recordserver + # now get signals and clean up properly. + # # Revision 1.14 2003/10/19 12:46:30 rshortt # Calling popen from the main loop now but signals still aren't getting thgough. *** *** 748,757 event, event_repeat_count = rc_object.poll() ! if event and event == OS_EVENT_POPEN2: ! print 'popen %s' % event.arg[1] ! event.arg[0].child = util.popen3.Popen3(event.arg[1]) else: ! print 'not handling event %s' % str(event) ! return --- 753,768 event, event_repeat_count = rc_object.poll() ! if event: ! if event == OS_EVENT_POPEN2: ! print 'popen %s' % event.arg[1] ! event.arg[0].child = util.popen3.Popen3(event.arg[1]) ! elif event == OS_EVENT_WAITPID: ! print 'waiting on pid %s' % event.arg[0] ! os.waitpid(event.arg[0], os.WNOHANG) ! else: ! print 'not handling event %s' % str(event) ! return else: ! print 'no event to get' --- This SF.net email sponsored by: Enterprise Linux Forum Conference Expo The Event For Linux Datacenter Solutions Strategies in The Enterprise Linux in the Boardroom; in the Front Office; in the Server Room http://www.enterpriselinuxforum.com ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src event.py,1.25,1.26
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21593/src
Modified Files:
event.py
Log Message:
Added OS_EVENT_WAITPID event for popen3.waitpid() to post so that recordserver
can pick it up and wait on its own child. Child processes from recordserver
now get signals and clean up properly.
Index: event.py
===
RCS file: /cvsroot/freevo/freevo/src/event.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** event.py18 Oct 2003 10:44:11 - 1.25
--- event.py19 Oct 2003 14:19:44 - 1.26
***
*** 10,13
--- 10,18
# ---
# $Log$
+ # Revision 1.26 2003/10/19 14:19:44 rshortt
+ # Added OS_EVENT_WAITPID event for popen3.waitpid() to post so that recordserver
+ # can pick it up and wait on its own child. Child processes from recordserver
+ # now get signals and clean up properly.
+ #
# Revision 1.25 2003/10/18 10:44:11 dischi
# renamed POPEN2 to OS_EVENT_POPEN2
***
*** 494,507
#
! PLAY_END= Event('PLAY_END')
! USER_END= Event('USER_END')
! DVD_PROTECTED = Event('DVD_PROTECTED')
! AUDIO_PLAY_END = Event('AUDIO_PLAY_END')
! PLAY_START = Event('PLAY_START')
! OSD_MESSAGE = Event('OSD_MESSAGE')
! VIDEO_START = Event('VIDEO_START')
! VIDEO_END = Event('VIDEO_END')
! OS_EVENT_POPEN2 = Event('OS_EVENT_POPEN2')
--- 499,513
#
! PLAY_END = Event('PLAY_END')
! USER_END = Event('USER_END')
! DVD_PROTECTED= Event('DVD_PROTECTED')
! AUDIO_PLAY_END = Event('AUDIO_PLAY_END')
! PLAY_START = Event('PLAY_START')
! OSD_MESSAGE = Event('OSD_MESSAGE')
! VIDEO_START = Event('VIDEO_START')
! VIDEO_END= Event('VIDEO_END')
! OS_EVENT_POPEN2 = Event('OS_EVENT_POPEN2')
! OS_EVENT_WAITPID = Event('OS_EVENT_WAITPID')
---
This SF.net email sponsored by: Enterprise Linux Forum Conference Expo
The Event For Linux Datacenter Solutions Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; in the Server Room
http://www.enterpriselinuxforum.com
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src event.py,1.26,1.27
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7196/src
Modified Files:
event.py
Log Message:
Added OS_EVENT_KILL. recordserver will now kill and wait.
Index: event.py
===
RCS file: /cvsroot/freevo/freevo/src/event.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** event.py19 Oct 2003 14:19:44 - 1.26
--- event.py19 Oct 2003 16:15:51 - 1.27
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.27 2003/10/19 16:15:51 rshortt
+ # Added OS_EVENT_KILL. recordserver will now kill and wait.
+ #
# Revision 1.26 2003/10/19 14:19:44 rshortt
# Added OS_EVENT_WAITPID event for popen3.waitpid() to post so that recordserver
***
*** 512,513
--- 515,517
OS_EVENT_POPEN2 = Event('OS_EVENT_POPEN2')
OS_EVENT_WAITPID = Event('OS_EVENT_WAITPID')
+ OS_EVENT_KILL= Event('OS_EVENT_KILL')
---
This SF.net email sponsored by: Enterprise Linux Forum Conference Expo
The Event For Linux Datacenter Solutions Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; in the Server Room
http://www.enterpriselinuxforum.com
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/tv/plugins generic_record.py,1.10,1.11
Update of /cvsroot/freevo/freevo/src/tv/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv7407/src/tv/plugins
Modified Files:
generic_record.py
Log Message:
Post event OS_EVENT_KILL for recordserver to do the deed (kill and wait).
Stop() command now works for me using this plugin / VCR_CMD.
Index: generic_record.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/plugins/generic_record.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** generic_record.py 12 Oct 2003 09:54:27 - 1.10
--- generic_record.py 19 Oct 2003 16:17:03 - 1.11
***
*** 11,14
--- 11,19
# ---
# $Log$
+ # Revision 1.11 2003/10/19 16:17:03 rshortt
+ # Post event OS_EVENT_KILL for recordserver to do the deed (kill and wait).
+ #
+ # Stop() command now works for me using this plugin / VCR_CMD.
+ #
# Revision 1.10 2003/10/12 09:54:27 dischi
# BSD patches from Lars
***
*** 59,62
--- 64,70
import childapp
import plugin
+ import rc
+
+ from event import *
DEBUG = config.DEBUG
***
*** 173,176
--- 181,186
print('Record_Thread::run: past wait()!!')
+
+ rc.post_event(Event(OS_EVENT_KILL, (self.app.child.pid, 15)))
self.app.kill()
---
This SF.net email sponsored by: Enterprise Linux Forum Conference Expo
The Event For Linux Datacenter Solutions Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; in the Server Room
http://www.enterpriselinuxforum.com
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers tv_grab.py,1.3,1.4
Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1:/tmp/cvs-serv18808/src/helpers
Modified Files:
tv_grab.py
Log Message:
Placed most of the work into functions and added a check for '__main__' for
the command line. I'm planning on importing this module from recordserver
and calling functions to grab and sort listings at a configurable time.
Alco changed '-query' to '--query' for consistency's sake.
Index: tv_grab.py
===
RCS file: /cvsroot/freevo/freevo/src/helpers/tv_grab.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tv_grab.py 15 Oct 2003 19:26:55 - 1.3
--- tv_grab.py 20 Oct 2003 00:32:11 - 1.4
***
*** 12,15
--- 12,22
# ---
# $Log$
+ # Revision 1.4 2003/10/20 00:32:11 rshortt
+ # Placed most of the work into functions and added a check for '__main__' for
+ # the command line. I'm planning on importing this module from recordserver
+ # and calling functions to grab and sort listings at a configurable time.
+ #
+ # Alco changed '-query' to '--query' for consistency's sake.
+ #
# Revision 1.3 2003/10/15 19:26:55 rshortt
# The channel number portion of TV_CHANNELS entries is handled as a string,
***
*** 49,114
import sys
import os
import config
- import util
def usage():
print 'Downloads the listing for xmltv and cache the data'
print
! print 'usage: freevo tv_grab [ -query ]'
print 'options:'
! print ' -query: print a list of all stations. The list can be used to set
TV_CHANNELS'
sys.exit(0)
! if len(sys.argv)1 and sys.argv[1] == '--help':
! usage()
!
! if not config.XMLTV_GRABBER:
! print 'No program found to grab the listings. Please set XMLTV_GRABBER'
! print 'in local.conf.py to the grabber you need'
! print
! usage()
- QUERY = 0
- if len(sys.argv)1 and sys.argv[1] == '-query':
- QUERY = 1
-
- if not os.path.isfile(config.XMLTV_FILE) or not QUERY:
print 'Grabbing listings.'
! os.system('%s --output %s --days %s' % ( config.XMLTV_GRABBER, config.XMLTV_FILE,
config.XMLTV_DAYS ))
! if os.path.isfile(config.XMLTV_SORT):
! print 'Sorting listings.'
! os.system('%s --output %s %s' % ( config.XMLTV_SORT, config.XMLTV_FILE,
! config.XMLTV_FILE ))
- print
- print 'searching for station information'
- chanlist = config.detect_channels()
! if QUERY:
! print
! print 'Possible list of tv channels. If you want to change the station'
! print 'id, copy the next statement into your local_conf.py and edit it.'
! print 'You can also remove lines or resort them'
! print
! print 'TV_CHANNELS = ['
! for c in chanlist[:-1]:
! print '( \'%s\', \'%s\', \'%s\' ), ' % c
! print '( \'%s\', \'%s\', \'%s\' ) ] ' % chanlist[-1]
! sys.exit(0)
! print 'caching data, this may take a while'
- import tv.epg_xmltv
- tv.epg_xmltv.get_guide()
! import tv.record_client as rc
! print 'Scheduling favorites for recording: '
- (result, response) = rc.updateFavoritesSchedule()
- print '%s' % response
--- 56,141
import sys
import os
+ import shutil
import config
def usage():
print 'Downloads the listing for xmltv and cache the data'
print
! print 'usage: freevo tv_grab [ --query ]'
print 'options:'
! print ' --query: print a list of all stations. The list can be used to set
TV_CHANNELS'
sys.exit(0)
! def grab():
! if not config.XMLTV_GRABBER:
! print 'No program found to grab the listings. Please set XMLTV_GRABBER'
! print 'in local.conf.py to the grabber you need'
! print
! usage()
print 'Grabbing listings.'
! xmltvtmp = '/tmp/TV.xml.tmp'
! os.system('%s --output %s --days %s' % ( config.XMLTV_GRABBER,
! xmltvtmp,
config.XMLTV_DAYS ))
! if os.path.exists(xmltvtmp):
! shutil.copyfile(xmltvtmp, config.XMLTV_FILE)
! os.unlink(xmltvtmp)
! def sort():
! if os.path.isfile(config.XMLTV_SORT):
! print 'Sorting listings.'
! xmltvtmp = '/tmp/TV.xml.tmp'
! os.system('%s --output %s %s' % ( config.XMLTV_SORT,
! xmltvtmp,
! config.XMLTV_FILE ))
! if os.path.exists(xmltvtmp):
! shutil.copyfile(xmltvtmp, config.XMLTV_FILE)
! os.unlink(xmltvtmp)
! else:
! print 'Not configured to use tv_sort, skipping.'
! if __name__ == '__main__':
! if len(sys.argv)1 and sys.argv[1] == '--help':
! usage
[Freevo-cvslog] freevo/src/www/htdocs favorites.rpy,1.7,1.8 guide.rpy,1.18,1.19 index.rpy,1.7,1.8 library.rpy,1.14,1.15 record.rpy,1.8,1.9 search.rpy,1.11,1.12
Update of /cvsroot/freevo/freevo/src/www/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv1306
Modified Files:
favorites.rpy guide.rpy index.rpy library.rpy record.rpy
search.rpy
Log Message:
more tv_util fixes
Index: favorites.rpy
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/favorites.rpy,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** favorites.rpy 5 Sep 2003 02:48:13 - 1.7
--- favorites.rpy 20 Oct 2003 02:24:16 - 1.8
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.8 2003/10/20 02:24:16 rshortt
+ # more tv_util fixes
+ #
# Revision 1.7 2003/09/05 02:48:13 rshortt
# Removing src/tv and src/www from PYTHONPATH in the freevo script. Therefore any
module that was imported from src/tv/ or src/www that didn't have a leading 'tv.' or
'www.' needed it added. Also moved tv/tv.py to tv/tvmenu.py to avoid namespace
conflicts.
***
*** 68,72
import tv.record_client as ri
! import tv.tv_util
from www.web_types import HTMLResource, FreevoResource
--- 71,75
import tv.record_client as ri
! import util.tv_util as tv_util
from www.web_types import HTMLResource, FreevoResource
***
*** 160,164
if fav.mod != 'ANY':
# cell = time.strftime('%b %d %H:%M', time.localtime(fav.start))
! cell = '%s' % tv.tv_util.minToTOD(fav.mod)
else:
cell = 'ANY'
--- 163,167
if fav.mod != 'ANY':
# cell = time.strftime('%b %d %H:%M', time.localtime(fav.start))
! cell = '%s' % tv_util.minToTOD(fav.mod)
else:
cell = 'ANY'
Index: guide.rpy
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/guide.rpy,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** guide.rpy 7 Sep 2003 18:50:56 - 1.18
--- guide.rpy 20 Oct 2003 02:24:17 - 1.19
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.19 2003/10/20 02:24:17 rshortt
+ # more tv_util fixes
+ #
# Revision 1.18 2003/09/07 18:50:56 dischi
# make description shorter if it's too long
***
*** 107,111
from twisted.web.woven import page
! import tv.tv_util
import util
import config
--- 110,114
from twisted.web.woven import page
! import util.tv_util as tv_util
import util
import config
***
*** 149,153
myt = time.mktime((myt_t[0], myt_t[1], myt_t[2], 0, 0, 5,
myt_t[6], myt_t[7], -1))
! listh = tv.tv_util.when_listings_expire()
if listh == 0:
return retval + '/select\n'
--- 152,156
myt = time.mktime((myt_t[0], myt_t[1], myt_t[2], 0, 0, 5,
myt_t[6], myt_t[7], -1))
! listh = tv_util.when_listings_expire()
if listh == 0:
return retval + '/select\n'
Index: index.rpy
===
RCS file: /cvsroot/freevo/freevo/src/www/htdocs/index.rpy,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.rpy 5 Sep 2003 02:48:13 - 1.7
--- index.rpy 20 Oct 2003 02:24:17 - 1.8
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.8 2003/10/20 02:24:17 rshortt
+ # more tv_util fixes
+ #
# Revision 1.7 2003/09/05 02:48:13 rshortt
# Removing src/tv and src/www from PYTHONPATH in the freevo script. Therefore any
module that was imported from src/tv/ or src/www that didn't have a leading 'tv.' or
'www.' needed it added. Also moved tv/tv.py to tv/tvmenu.py to avoid namespace
conflicts.
***
*** 68,72
from www.web_types import HTMLResource, FreevoResource
import util, config
! import tv.tv_util
TRUE = 1
--- 71,75
from www.web_types import HTMLResource, FreevoResource
import util, config
! import util.tv_util as tv_util
TRUE = 1
***
*** 88,92
fv.res += 'pfont color=white The recording server is up and
running./font/p'
! listexpire = tv.tv_util.when_listings_expire()
if listexpire == 1:
fv.res += 'pfont color=red Notice: Your listings expire in 1
hour./font/p'
--- 91,95
fv.res += 'pfont color=white The recording server is up and
running./font/p'
! listexpire = tv_util.when_listings_expire()
if listexpire == 1:
fv.res += 'pfont color=red Notice: Your listings expire in 1
hour./font
[Freevo-cvslog] freevo/src/tv program_display.py,1.18,1.19 program_search.py,1.9,1.10 record_types.py,1.5,1.6 tvmenu.py,1.6,1.7
Update of /cvsroot/freevo/freevo/src/tv
In directory sc8-pr-cvs1:/tmp/cvs-serv28005/src/tv
Modified Files:
program_display.py program_search.py record_types.py tvmenu.py
Log Message:
Moving tv_util from src/tv/ to src/util/.
Index: program_display.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/program_display.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** program_display.py 18 Oct 2003 09:33:34 - 1.18
--- program_display.py 20 Oct 2003 01:41:55 - 1.19
***
*** 10,13
--- 10,16
#---
# $Log$
+ # Revision 1.19 2003/10/20 01:41:55 rshortt
+ # Moving tv_util from src/tv/ to src/util/.
+ #
# Revision 1.18 2003/10/18 09:33:34 dischi
# fix some parent handling and remove the PopupBox
***
*** 79,83
import time
! import config, tv.edit_favorite, tv.tv_util
import tv.record_client as record_client
import tv.view_favorites, tv.program_search
--- 82,87
import time
! import config, tv.edit_favorite
! import util.tv_util as tv_util
import tv.record_client as record_client
import tv.view_favorites, tv.program_search
***
*** 143,147
chan = Label('Channel: %s' % \
! tv.tv_util.get_chan_displayname(self.prog.channel_id),
self, Align.LEFT)
chan.set_font(font=self.font.name, size=self.font.size -2,
--- 147,151
chan = Label('Channel: %s' % \
! tv_util.get_chan_displayname(self.prog.channel_id),
self, Align.LEFT)
chan.set_font(font=self.font.name, size=self.font.size -2,
***
*** 362,366
(time.strftime(config.TV_DATETIMEFORMAT,
time.localtime(prog.start)),
!
tv.tv_util.get_chan_displayname(prog.channel_id),
prog.title),
value=prog)
--- 366,370
(time.strftime(config.TV_DATETIMEFORMAT,
time.localtime(prog.start)),
!tv_util.get_chan_displayname(prog.channel_id),
prog.title),
value=prog)
Index: program_search.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/program_search.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** program_search.py 7 Sep 2003 11:18:27 - 1.9
--- program_search.py 20 Oct 2003 01:41:55 - 1.10
***
*** 12,15
--- 12,18
# ---
# $Log$
+ # Revision 1.10 2003/10/20 01:41:55 rshortt
+ # Moving tv_util from src/tv/ to src/util/.
+ #
# Revision 1.9 2003/09/07 11:18:27 dischi
# many optical improvements
***
*** 49,53
import time
! import config, tv.program_display, tv.tv_util
import tv.record_client as record_client
import event as em
--- 52,57
import time
! import config, tv.program_display
! import util.tv_util as tv_util
import tv.record_client as record_client
import event as em
***
*** 145,149
(time.strftime('%b %d %I:%M %p',
time.localtime(prog.start)),
!
tv.tv_util.get_chan_displayname(prog.channel_id),
prog.title),
value=prog)
--- 149,153
(time.strftime('%b %d %I:%M %p',
time.localtime(prog.start)),
!
tv_util.get_chan_displayname(prog.channel_id),
prog.title),
value=prog)
Index: record_types.py
===
RCS file: /cvsroot/freevo/freevo/src/tv/record_types.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** record_types.py 5 Sep 2003 02:48:12 - 1.5
--- record_types.py 20 Oct 2003 01:41:55 - 1.6
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.6 2003/10/20 01:41:55 rshortt
+ # Moving tv_util from src/tv/ to src/util/.
+ #
# Revision 1.5 2003/09/05 02:48:12 rshortt
[Freevo-cvslog] freevo/src/tv tv_util.py,1.11,NONE
Update of /cvsroot/freevo/freevo/src/tv In directory sc8-pr-cvs1:/tmp/cvs-serv28085/src/tv Removed Files: tv_util.py Log Message: Moved to src/util/tv_util.py. Please remove left over .pyc or .pyo files. --- tv_util.py DELETED --- --- This SF.net email sponsored by: Enterprise Linux Forum Conference Expo The Event For Linux Datacenter Solutions Strategies in The Enterprise Linux in the Boardroom; in the Front Office; in the Server Room http://www.enterpriselinuxforum.com ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/www/htdocs manualrecord.rpy,1.6,1.7
Update of /cvsroot/freevo/freevo/src/www/htdocs In directory sc8-pr-cvs1:/tmp/cvs-serv3083/src/www/htdocs Modified Files: manualrecord.rpy Log Message: Squish the time off by one hour bug. Using our strptime instead of python 2.2's. Index: manualrecord.rpy === RCS file: /cvsroot/freevo/freevo/src/www/htdocs/manualrecord.rpy,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** manualrecord.rpy5 Sep 2003 02:48:13 - 1.6 --- manualrecord.rpy20 Oct 2003 02:36:21 - 1.7 *** *** 36,39 --- 36,48 import tv.record_client as ri + # Use the alternate strptime module which seems to handle time zones + # + # XXX Remove when we are ready to require Python 2.3 + if float(sys.version[0:3]) 2.3: + import tv.strptime as strptime + else: + import _strptime as strptime + + from www.web_types import HTMLResource, FreevoResource *** *** 93,99 startyear = str(int(startyear) + 1) # create utc second start time ! starttime = time.mktime(time.strptime(str(startmonth)+ +str(startday)+ +str(startyear)+ +str(starthour)+:+str(startminute)+:00,'%m %d %Y %H:%M:%S')) # create utc stop time ! stoptime = time.mktime(time.strptime(str(stopmonth)+ +str(stopday)+ +str(stopyear)+ +str(stophour)+:+str(stopminute)+:00,'%m %d %Y %H:%M:%S')) # so we don't record for more then maxdays (maxdays day * 24hr/day * 60 min/hr * 60 sec/min) if abs(stoptime - starttime) (MAXDAYS * 86400): --- 102,108 startyear = str(int(startyear) + 1) # create utc second start time ! starttime = time.mktime(strptime.strptime(str(startmonth)+ +str(startday)+ +str(startyear)+ +str(starthour)+:+str(startminute)+:00,'%m %d %Y %H:%M:%S')) # create utc stop time ! stoptime = time.mktime(strptime.strptime(str(stopmonth)+ +str(stopday)+ +str(stopyear)+ +str(stophour)+:+str(stopminute)+:00,'%m %d %Y %H:%M:%S')) # so we don't record for more then maxdays (maxdays day * 24hr/day * 60 min/hr * 60 sec/min) if abs(stoptime - starttime) (MAXDAYS * 86400): *** *** 125,129 channelselect = 'select name=chan' for ch in guide.chan_list: ! channelselect = channelselect + 'option value='+ch.id+''+ch.tunerid+\n channelselect = channelselect + /select\n --- 134,138 channelselect = 'select name=chan' for ch in guide.chan_list: ! channelselect = channelselect + 'option value='+ch.id+''+str(ch.tunerid)+\n channelselect = channelselect + /select\n --- This SF.net email sponsored by: Enterprise Linux Forum Conference Expo The Event For Linux Datacenter Solutions Strategies in The Enterprise Linux in the Boardroom; in the Front Office; in the Server Room http://www.enterpriselinuxforum.com ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins idlebar.py,1.44,1.45
Update of /cvsroot/freevo/freevo/src/plugins In directory sc8-pr-cvs1:/tmp/cvs-serv28005/src/plugins Modified Files: idlebar.py Log Message: Moving tv_util from src/tv/ to src/util/. Index: idlebar.py === RCS file: /cvsroot/freevo/freevo/src/plugins/idlebar.py,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** idlebar.py 18 Oct 2003 11:16:37 - 1.44 --- idlebar.py 20 Oct 2003 01:41:55 - 1.45 *** *** 21,24 --- 21,27 # --- # $Log$ + # Revision 1.45 2003/10/20 01:41:55 rshortt + # Moving tv_util from src/tv/ to src/util/. + # # Revision 1.44 2003/10/18 11:16:37 dischi # patch from Cyril Lacoux to support locale for the clock *** *** 70,74 import mailbox import skin ! import tv.tv_util as tv_util import plugin --- 73,77 import mailbox import skin ! import util.tv_util as tv_util import plugin --- This SF.net email sponsored by: Enterprise Linux Forum Conference Expo The Event For Linux Datacenter Solutions Strategies in The Enterprise Linux in the Boardroom; in the Front Office; in the Server Room http://www.enterpriselinuxforum.com ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers recordserver.py,1.16,1.17
Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1:/tmp/cvs-serv28005/src/helpers
Modified Files:
recordserver.py
Log Message:
Moving tv_util from src/tv/ to src/util/.
Index: recordserver.py
===
RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** recordserver.py 19 Oct 2003 16:15:52 - 1.16
--- recordserver.py 20 Oct 2003 01:41:55 - 1.17
***
*** 7,10
--- 7,13
# ---
# $Log$
+ # Revision 1.17 2003/10/20 01:41:55 rshortt
+ # Moving tv_util from src/tv/ to src/util/.
+ #
# Revision 1.16 2003/10/19 16:15:52 rshortt
# Added OS_EVENT_KILL. recordserver will now kill and wait.
***
*** 123,127
import tv.record_types
import tv.epg_xmltv
! import tv.tv_util
import plugin
import util.popen3
--- 126,130
import tv.record_types
import tv.epg_xmltv
! import util.tv_util as tv_util
import plugin
import util.popen3
***
*** 209,213
scheduledRecordings = self.getScheduledRecordings()
! scheduledRecordings.addProgram(prog, tv.tv_util.getKey(prog))
self.saveScheduledRecordings(scheduledRecordings)
--- 212,216
scheduledRecordings = self.getScheduledRecordings()
! scheduledRecordings.addProgram(prog, tv_util.getKey(prog))
self.saveScheduledRecordings(scheduledRecordings)
***
*** 220,224
scheduledRecordings = self.getScheduledRecordings()
! scheduledRecordings.removeProgram(prog, tv.tv_util.getKey(prog))
self.saveScheduledRecordings(scheduledRecordings)
now = time.time()
--- 223,227
scheduledRecordings = self.getScheduledRecordings()
! scheduledRecordings.removeProgram(prog, tv_util.getKey(prog))
self.saveScheduledRecordings(scheduledRecordings)
now = time.time()
***
*** 340,344
prog.isRecording = TRUE
prog.rec_duration = duration
! prog.filename = tv.tv_util.getProgFilename(prog)
rec_prog = prog
--- 343,347
prog.isRecording = TRUE
prog.rec_duration = duration
! prog.filename = tv_util.getProgFilename(prog)
rec_prog = prog
***
*** 349,353
if DEBUG: log.debug('found a program to clean')
cleaned = TRUE
! del progs[tv.tv_util.getKey(prog)]
if rec_prog or cleaned:
--- 352,356
if DEBUG: log.debug('found a program to clean')
cleaned = TRUE
! del progs[tv_util.getKey(prog)]
if rec_prog or cleaned:
***
*** 484,488
if prog.title == fav.title:
! if fav.channel == tv.tv_util.get_chan_displayname(prog.channel_id) \
or fav.channel == 'ANY':
if fav.dow == dow or fav.dow == 'ANY':
--- 487,491
if prog.title == fav.title:
! if fav.channel == tv_util.get_chan_displayname(prog.channel_id) \
or fav.channel == 'ANY':
if fav.dow == dow or fav.dow == 'ANY':
---
This SF.net email sponsored by: Enterprise Linux Forum Conference Expo
The Event For Linux Datacenter Solutions Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; in the Server Room
http://www.enterpriselinuxforum.com
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
