diff options
| author |   Anders Rune Jensen <arj@gentoo.org> | 2005-03-01 23:08:37 +0000 |
|---|---|---|
| committer | Anders Rune Jensen <arj@gentoo.org> | 2005-03-01 23:08:37 +0000 |
| commit | 7865b53b8a7801795fcfae40a3f1b088030efd64 (patch) | |
| tree | 608117daeceff7512c9d3a4334327b7f3f9cc36b /media-video | |
| parent | also fix lib/Makefile.in (diff) | |
| download | gentoo-2-7865b53b8a7801795fcfae40a3f1b088030efd64.tar.gz gentoo-2-7865b53b8a7801795fcfae40a3f1b088030efd64.tar.bz2 gentoo-2-7865b53b8a7801795fcfae40a3f1b088030efd64.zip | |
new patch
(Portage version: 2.0.51-r15)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/cxfe/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/cxfe/files/position-osd.patch | 48 |
2 files changed, 13 insertions, 40 deletions
diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog index 491508f33abb..601f0ffb0ca3 100644 --- a/media-video/cxfe/ChangeLog +++ b/media-video/cxfe/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/cxfe # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.9 2005/02/24 16:42:11 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.10 2005/03/01 23:08:37 arj Exp $ + + 01 Mar 2005; Anders Rune Jensen <arj@gentoo.org> files/position-osd.patch: + Better position patch. 24 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> cxfe-0.9.1-r1.ebuild: apllied a patch to fix #82684. diff --git a/media-video/cxfe/files/position-osd.patch b/media-video/cxfe/files/position-osd.patch index 00faa4b18dc0..2d04a38c14cd 100644 --- a/media-video/cxfe/files/position-osd.patch +++ b/media-video/cxfe/files/position-osd.patch @@ -1,25 +1,12 @@ -Common subdirectories: cxfe/CVS and cxfe-mod/CVS -diff -uN cxfe/README cxfe-mod/README ---- cxfe/README 2004-11-27 03:32:10.000000000 +0100 -+++ cxfe-mod/README 2005-01-15 06:26:10.714383896 +0100 -@@ -91,6 +91,7 @@ - Up Arrow - increases Volume - Down Arrow - decrease Volume - f - Full Screen/Window Toggle (X only) -+o - Display position in stream - d - Toggle Deinterlace/post processing (uses default or post set with - -p switch) - s - Skip to next MRL if multiple MRLS supplied. If only one -diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c --- cxfe/cxfe.c 2004-11-27 03:07:59.000000000 +0100 -+++ cxfe-mod/cxfe.c 2005-01-15 06:30:27.162397872 +0100 -@@ -476,6 +476,27 @@ ++++ cxfe-mod/cxfe.c 2005-03-01 23:37:18.394875952 +0100 +@@ -476,6 +476,28 @@ percent_done = (ltime/llength)*100; printf("Time:%d sec Length:%d sec \n",ltime/1000,llength/1000); } +static void print_osd_status() +{ -+ int lpos, ltime, llength; ++ int lpos, ltime, llength; + int percent_done; + + @@ -35,13 +22,14 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c + int tot_min = (llength/1000-tot_hour*60*60)/60; + int tot_sec= llength/1000-tot_hour*60*60-tot_min*60; + -+ osd_display_info("%d:%d:%d / %d:%d:%d (%d%%)", cur_hour, cur_min, cur_sec, -+ tot_hour, tot_min, tot_sec, percent_done); ++ osd_display_info("%02d:%02d:%02d / %02d:%02d:%02d (%2d%%)", cur_hour, ++ cur_min, cur_sec, tot_hour, tot_min, tot_sec, ++ percent_done); +} #ifdef HAVE_LIBLIRC_CLIENT static void *process_lirc_thread() { -@@ -518,6 +539,8 @@ +@@ -518,6 +540,8 @@ if (!strcmp(c,"Quit")){ running = 0; next_mrl = FALSE;} @@ -50,7 +38,7 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c if (!strcmp(c,"ASPECT_CHANGE")) aspect_change(); if (!strcmp(c,"Menu")) -@@ -679,6 +702,10 @@ +@@ -679,6 +703,10 @@ case 'D': toggle_deinterlace(); break; @@ -61,7 +49,7 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c case 'l': case 13: send_event(XINE_EVENT_INPUT_SELECT); -@@ -864,6 +891,10 @@ +@@ -864,6 +892,10 @@ case XK_M: send_event(XINE_EVENT_INPUT_DOWN); break; @@ -72,21 +60,3 @@ diff -uN cxfe/cxfe.c cxfe-mod/cxfe.c case XK_Return: send_event(XINE_EVENT_INPUT_SELECT); break; -diff -uN cxfe/lircrc-example cxfe-mod/lircrc-example ---- cxfe/lircrc-example 2004-11-15 15:44:06.000000000 +0100 -+++ cxfe-mod/lircrc-example 2005-01-15 06:29:39.959573792 +0100 -@@ -99,6 +99,13 @@ - end - begin - remote = REALmagic -+ button = OSD -+ prog = cxfe -+ repeat = 0 -+ config = STATUS -+end -+begin -+ remote = REALmagic - button = 1 - prog = cxfe - repeat = 0 -Common subdirectories: cxfe/termio and cxfe-mod/termio |