Release version 0.0.8v0.0.8

- Added Navigation through channel in a way like with ordinary VDR. Use
  the Left/Right keys to select channel groups, OK to choose one or the
  number keys to directly enter a channel number. All this only works
  with enabled info window.
- Extended the info window to contain more information. The amount of
  information shown can be chosen through the setup menu. This directly
  affects the height of the info window.
- Using the info window to show vdr messages if they occur.
- Changed the manner the moving of the PiP window works. Now move mode
  is enabled or disabled by pressing the green button. In move mode,
  the cursor keys can be used to move the PiP window.
- Added some more predefined PiP window sizes. You have to reset your
  size in setup menu.
- Added support for ffmpeg 0.4.9 (should work with 0.4.8, too)
- Updated finnish translations (thanks to Rolf Ahrenberg)
- Cleaned up, dropped support for vdr versions older than 1.3.8

1 files changed, 46 insertions, 69 deletions

diff --git a/README b/README
index 29ecad0..c35f54d 100644
--- a/README
+++ b/README
@@ -11,10 +11,15 @@ See the file COPYING for license information.
 
 
 Requirements:
+-------------
+
+- vdr 1.3.8 or higher
+- libavcodec from ffmpeg (http://ffmpeg.sourceforge.net) version 0.4.8 or
+  higher
 
-- libavcodec from ffmpeg (http://ffmpeg.sourceforge.net) version 0.4.8
 
 Description:
+------------
 
 OSD Picture-in-Picture is a PlugIn that displays the current channel in a 
 small box on the screen (default upper right corner). You can switch up and 
@@ -25,92 +30,64 @@ The plugin supports four modes:
  - greyscaled (256 shades of grey)
  - 256 colors with fixed palette
  - 128 colors with variable palette
-The first mode works with an ordinary vdr installation. If you want to use the
-other modes, you'll need to upgrade your VDR to support a 256 color OSD
-with the provided patching instruction. The variable palette mode needs more
-extensive changes to VDR's source code using the provided patch that gives the
-plugin more control over the OSD's palette. You can choose the color depth in 
-the setup menu. If you didn't patch VDR appropriately, you'll only be able to
-choose greyscaled mode.
+They all work with an ordinary vdr installation.
 The plugin has the possibility to choose the PiP size (in the setup menu from
-predefined sizes) and position (by moving it around using number keys) as well
-as crop dimensions.
+predefined sizes) and position (by moving it around using the cursor keys) as
+well as crop dimensions.
+
+ATTENTION: To have the position saved, you have to enter the plugin's setup
+menu and hit the ok button.
 
-ATTENTION: To have the position saved, you have to enter the plugin's setup menu
-and hit the ok button.
+The plugin lets you choose the MPEG frames to decode and display (in the setup
+menu). For slower machines it is further possible to set an additional frame
+dropping.
 
-From 0.0.3 on the plugin lets you choose the MPEG frames to decode and display
-(in the setup menu). For slower machines it is further possible to set an
-additional frame dropping.
+The plugin is able to show some channel and schedule info in a second window
+when switching channels. In setup menu you can change it's position, size and
+the amount of information shown.
 
-From 0.0.4 the plugins shows some channel and schedule info in a second window
-when switching channels. In setup menu you can change it's position and size.
-This works flawlessly in 16 color greyscale mode. If you want to use it in one
-of the other provided modes you have to use one of the already mentioned
-patches. Otherwise you have to live with wrong colors in this modes.
 
 Installation:
+-------------
 
-Let's say osdpip's version is 0.0.1 and vdr's version is 1.2.6. If you 
+Let's say osdpip's version is 0.0.1 and vdr's version is 1.3.8. If you 
 use anything else please exchange the version numbers appropriately (this
 way I don't have to update this section all the times;) ).
 
-cd vdr-1.2.6/PLUGINS/src
+cd vdr-1.3.8/PLUGINS/src
 tar xvfz vdr-osdpip-0.0.1.tgz
 ln -s osdpip-0.0.1 osdpip
 cd ../..
 
-If you have ffmpeg installed, make plugins should do just fine now, but if you
-have it next to your vdr folder (e.g. as the DXR3 plugin needs it), you have
-to compile with make FFMPEG_STATIC=1 plugins. Ffmpeg must then be present in a
-folder (or symlink) called "ffmpeg".
-
-NOTE: Patching VDR is not needed if you are using a VDR version greater than
-1.3.7.
-
-Patching VDR:
-
-NOTE: The next step is not needed if you use the variable color patch provided
-below that!
-
-Now, you have to call your favourite editor to open osdbase.h and jump to line
-number 16. I don't provide a patch here because some patches already touch that
-area. Well this one's easy, though. Just increase the number of colors in this
-line to 256. If you don't want 256 color support, you can skip this part.
+If you have a VDR version lower than 1.2.25, you will have to patch it using
+the file vdr-osd.diff. This patch fixes a bug in VDR regardings osd usage.
 
-#define MAXNUMCOLORS 256
+patch -p1 < PLUGINS/src/osdpip/patches/vdr-osd.diff
 
-If you want an error free 256 color mode you will have to further modify VDR's
-source code using a patch from patches subdirectory. It fixes a bug of all VDR
-versions up to 1.3.3. I provide two versions of the patch:
-vdr-1.2.6-indexes.diff for a plain VDR installation and
-vdr-1.2.6-256-indexes.diff for a version that already has 256 color support.
+After applying it you have to recompile your VDR.
 
-To apply this patch call
- patch -p1 < PLUGINS/src/osdpip/patches/vdr-1.2.6-indexes.diff
-from VDR's source code directory.
-
-If you want variable palette color mode you will have to further modify VDR's
-source code using a patch from patches subdirectory. I provide two versions of
-the patch: vdr-1.2.6-palette.diff for a plain VDR installation and
-vdr-1.2.6-256-palette.diff for a version that already has 256 color support.
-
-To apply this patch call
- patch -p1 < PLUGINS/src/osdpip/patches/vdr-1.2.6-palette.diff
-from VDR's source code directory.
-
-Now, you have to re-build VDR and Plugins.
-
-make [options, if necessary] vdr
-make [options, if necessary] plugins
+If you have ffmpeg installed, "make plugins" should do just fine now, but if
+you have it next to your vdr folder (e.g. as the DXR3 plugin needs it), you
+have to compile with "make FFMPEG_STATIC=1 plugins". Ffmpeg must then be
+present in a folder (or symlink) called "ffmpeg".
 
 
 Controls:
-
-Up/Down    Switch Channel up/down
-1-4,6-9    Move box around like with cursor keys
-0          Switch back to PiP channel and exit PiP
-Red        Swap PiP channel with currently viewed channel
-Back       Exit PiP without switching back
-Ok         Show/hide channel info window
+---------
+
+Normal Mode:
+Up/Down      Switch channel up/down
+Left/Right   Select channel group (only when info window enabled)
+1-9          Select channel (only when info window enabled)
+Red          Swap PiP channel with currently viewed channel
+Green        Switch to move mode
+Ok           Show/hide channel info window
+0            Switch back to PiP channel and exit PiP
+Back         Exit PiP without switching back
+
+Move Mode:
+Cursor keys  Move PiP window around
+Green        Switch to normal mode
+0            Switch back to PiP channel and exit PiP
+Back         Exit PiP without switching back