Author: duncan
Date: Thu Feb 21 15:42:52 2008
New Revision: 10403
Log:
Consolidating differencies between rel-1 and rel-1-7
Removed:
branches/rel-1-7/freevo/src/xmradioHELP
Modified:
branches/rel-1-7/freevo/src/event.py
branches/rel-1-7/freevo/src/osd.py
Modified: branches/rel-1-7/freevo/src/event.py
==============================================================================
--- branches/rel-1-7/freevo/src/event.py (original)
+++ branches/rel-1-7/freevo/src/event.py Thu Feb 21 15:42:52 2008
@@ -153,6 +153,9 @@
TV_CHANNEL_DOWN = Event('TV_CHANNEL_DOWN')
TV_CHANNEL_LAST = Event('TV_CHANNEL_LAST')
TV_SEND_TVTIME_CMD = Event('TV_SEND_TVTIME_CMD')
+TV_GOTO_LIVE_PLAY = Event('TV_GOTO_LIVE_PLAY')
+VIDEO_NEXT_FILLMODE = Event('VIDEO_NEXT_FILLMODE')
+VIDEO_NEXT_AUDIOMODE = Event('VIDEO_NEXT_AUDIOMODE')
#
# Global playing events
@@ -342,6 +345,7 @@
'REW' : Event(SEEK, arg=-10),
'FFWD' : Event(SEEK, arg=10),
'DISPLAY' : TOGGLE_OSD,
+ 'REC' : TV_START_RECORDING,
'0' : INPUT_0,
'1' : INPUT_1,
'2' : INPUT_2,
Modified: branches/rel-1-7/freevo/src/osd.py
==============================================================================
--- branches/rel-1-7/freevo/src/osd.py (original)
+++ branches/rel-1-7/freevo/src/osd.py Thu Feb 21 15:42:52 2008
@@ -878,9 +878,12 @@
def __drawstringframed_line__(self, string, max_width, font, hard,
ellipses, word_splitter):
"""
- calculate _one_ line for drawstringframed. Returns a list:
- width used, string to draw, rest that didn't fit and True if this
- function stopped because of a \n.
+ calculate _one_ line for drawstringframed.
+ @returns: a tuple containing
+ - width used
+ - string to draw
+ - rest that didn't fit
+ - True if this function stopped because of a <nl>.
"""
c = 0 # num of chars fitting
width = 0 # width needed
@@ -984,23 +987,22 @@
draw the part that fit and returns the other that doesn't.
This is a wrapper to drawstringframedsoft() and -hard()
- Parameters:
- - string: the string to be drawn, supports also '\n'. \t is not
supported
- by pygame, you need to replace it first
- - x,y: the posistion
- - width, height: the frame dimensions,
- height == -1 defaults to the font height size
- - fgcolor, bgcolor: the color for the foreground and background
- respectively. (Supports the alpha channel: 0xAARRGGBB)
- - font, ptsize: font and font point size
- - align_h: horizontal align. Can be left, center, right, justified
- - align_v: vertical align. Can be top, bottom, center or middle
- - mode: the way we should break lines/truncate. Can be 'hard'(based on
chars)
- or 'soft' (based on words)
-
- font can also be a skin font object. If so, this functions also
supports
- shadow and border. fgcolor and bgcolor will also be taken from the skin
- font if set to None when calling this function.
+ @param string: the string to be drawn, supports also <nl>. <tab> is
not supported
+ by pygame, you need to replace it first
+ @param x: horizontal position
+ @param y: vertical position
+ @param width: frame width
+ @param height: frame height == -1 defaults to the font height size
+ @param fgcolor, bgcolor: the color for the foreground and background
+ respectively. (Supports the alpha channel: 0xAARRGGBB)
+ @param font, ptsize: font and font point size font can also be a skin
font
+ object. If so, this functions also supports shadow and border.
fgcolor and
+ bgcolor will also be taken from the skin font if set to None when
calling this
+ function.
+ @param align_h: horizontal align. Can be left, center, right, justified
+ @param align_v: vertical align. Can be top, bottom, center or middle
+ @param mode: the way we should break lines/truncate. Can be
'hard'(based on chars)
+ or 'soft' (based on words)
"""
if not pygame.display.get_init():
return '', (x,y,x,y)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
