Author: duncan
Date: Sun May 13 11:28:33 2007
New Revision: 9572
Modified:
branches/rel-1/freevo/src/event.py
branches/rel-1/freevo/src/image/viewer.py
branches/rel-1/freevo/src/plugins/shoppingcart.py
branches/rel-1/freevo/src/tv/channels.py
branches/rel-1/freevo/src/tv/plugins/ivtv_record.py
branches/rel-1/freevo/src/video/configure.py
branches/rel-1/freevo/src/video/videoitem.py
Log:
Various patches from Koval Valery applied
Modified: branches/rel-1/freevo/src/event.py
==============================================================================
--- branches/rel-1/freevo/src/event.py (original)
+++ branches/rel-1/freevo/src/event.py Sun May 13 11:28:33 2007
@@ -208,6 +208,7 @@
IMAGE_SAVE = Event('IMAGE_SAVE')
IMAGE_MOVE = Event('IMAGE_MOVE')
+IMAGE_TAG = Event('IMAGE_TAG')
#
# Games module
@@ -448,6 +449,7 @@
'0' : IMAGE_NO_ZOOM,
'DISPLAY' : TOGGLE_OSD,
'REC' : IMAGE_SAVE,
+ 'ENTER' : IMAGE_TAG,
'UP' : PLAYLIST_PREV,
'DOWN' : PLAYLIST_NEXT,
'CH+' : PLAYLIST_PREV,
Modified: branches/rel-1/freevo/src/image/viewer.py
==============================================================================
--- branches/rel-1/freevo/src/image/viewer.py (original)
+++ branches/rel-1/freevo/src/image/viewer.py Sun May 13 11:28:33 2007
@@ -404,6 +404,15 @@
self.osd.bitmapcache.__delitem__(self.filename)
return True
+ # append the image filename to shoppingcart list
+ elif event == IMAGE_TAG:
+ if plugin.is_active('shoppingcart'):
+ try:
+ plugin.get('item')[0].addItemToCart(self.fileitem)
+ return True
+ except Exception, e:
+ print 'getbyname(\'shoppingcart\')', e
+
else:
return self.fileitem.eventhandler(event)
Modified: branches/rel-1/freevo/src/plugins/shoppingcart.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/shoppingcart.py (original)
+++ branches/rel-1/freevo/src/plugins/shoppingcart.py Sun May 13 11:28:33 2007
@@ -98,6 +98,15 @@
rc.post_event(em.Event(em.OSD_MESSAGE, arg=_('Added to Cart')))
+ def addItemToCart(self, item):
+ if hasattr(item, 'subitems') and item.subitems:
+ for s in item.subitems:
+ self.cart.append(s)
+ else:
+ self.cart.append(item)
+ rc.post_event(em.Event(em.OSD_MESSAGE, arg=_('Added Item to Cart')))
+
+
def deleteCart(self, arg=None, menuw=None):
self.cart = []
rc.post_event(em.MENU_BACK_ONE_MENU)
Modified: branches/rel-1/freevo/src/tv/channels.py
==============================================================================
--- branches/rel-1/freevo/src/tv/channels.py (original)
+++ branches/rel-1/freevo/src/tv/channels.py Sun May 13 11:28:33 2007
@@ -202,6 +202,15 @@
except:
print String(_('Failed to set freq for channel %s.') % chan)
+ if vg.desc == "INTER":
+ cmd="sudo /usr/local/sbin/set_inter"
+ if DEBUG:
+ print "run cmd: %s" % cmd
+ import os
+ retcode=os.system(cmd)
+ if DEBUG:
+ print "exit code: %g" % retcode
+
return 0
Modified: branches/rel-1/freevo/src/tv/plugins/ivtv_record.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/ivtv_record.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/ivtv_record.py Sun May 13 11:28:33 2007
@@ -135,6 +135,14 @@
if DEBUG: print 'Setting Channel to %s' % self.prog.tunerid
fc.chanSet(str(self.prog.tunerid), False)
+ if vg.desc == "INTER":
+ cmd="sudo /usr/local/sbin/set_inter"
+ if DEBUG:
+ print "run cmd: %s" % cmd
+ retcode=os.system(cmd)
+ if DEBUG:
+ print "exit code: %g" % retcode
+
if DEBUG: v.print_settings()
now = time.time()
Modified: branches/rel-1/freevo/src/video/configure.py
==============================================================================
--- branches/rel-1/freevo/src/video/configure.py (original)
+++ branches/rel-1/freevo/src/video/configure.py Sun May 13 11:28:33 2007
@@ -211,6 +211,39 @@
#
+# Field_dominance
+#
+
+def toggle3(arg=None, menuw=None):
+ arg[1][arg[2]] += 1
+ if arg[1][arg[2]] > 1:
+ arg[1][arg[2]] = -1
+
+ old = menuw.menustack[-1].selected
+ pos = menuw.menustack[-1].choices.index(menuw.menustack[-1].selected)
+
+ new = add_toogle3(arg[0], arg[1], arg[2])
+ new.image = old.image
+
+ if hasattr(old, 'display_type'):
+ new.display_type = old.display_type
+
+ menuw.menustack[-1].choices[pos] = new
+ menuw.menustack[-1].selected = menuw.menustack[-1].choices[pos]
+
+ menuw.init_page()
+ menuw.refresh()
+
+def add_toogle3(name, item, var):
+ if item[var] == -1:
+ return menu.MenuItem(_('Turn TOP field first'), toggle3, (name, item,
var))
+ elif item[var] == 0:
+ return menu.MenuItem(_('Turn BOTTOM field first'), toggle3, (name,
item, var))
+ else:
+ return menu.MenuItem(_('Turn AUTO field first'), toggle3, (name, item,
var))
+
+
+#
# config main menu
#
@@ -238,7 +271,7 @@
items += [ add_toogle(_('Deinterlacing'), item, 'deinterlace') ]
items += [ add_toogle(_('X-Video Motion Compensation (xvmc)'), item,
'xvmc') ]
if hasattr(config, 'MPLAYER_HAS_FIELD_DOMINANCE') and
config.MPLAYER_HAS_FIELD_DOMINANCE:
- items += [ add_toogle(_('Bottom field first'), item,
'field-dominance') ]
+ items += [ add_toogle3(_('Turn BOTTOM field first'), item,
'field-dominance') ]
return items
Modified: branches/rel-1/freevo/src/video/videoitem.py
==============================================================================
--- branches/rel-1/freevo/src/video/videoitem.py (original)
+++ branches/rel-1/freevo/src/video/videoitem.py Sun May 13 11:28:33 2007
@@ -52,7 +52,7 @@
class VideoItem(Item):
def __init__(self, url, parent, info=None, parse=True):
- self.autovars = [ ('deinterlace', 0), ('xvmc', config.USE_XVMC),
('field-dominance', config.FIELD_DOMINANCE) ]
+ self.autovars = [ ('deinterlace', 0), ('xvmc', 0), ('field-dominance',
0) ]
Item.__init__(self, parent)
self.type = 'video'
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
