diff options
| author | wr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-01-09 20:33:52 +0000 |
|---|---|---|
| committer | wr61 <wr61@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-01-09 20:33:52 +0000 |
| commit | b4a6f9d32433999b40013f71fa362488bff5f18f (patch) | |
| tree | b386509065429aae4a7a42172f1cac59c45a1c99 /muggle-plugin/vdr_menu.c | |
| parent | 76c87a8955dc8d7a800b9519cd54c2f337f2c273 (diff) | |
| download | vdr-plugin-muggle-b4a6f9d32433999b40013f71fa362488bff5f18f.tar.gz vdr-plugin-muggle-b4a6f9d32433999b40013f71fa362488bff5f18f.tar.bz2 | |
merge patch to compile with 1.3.18
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@337 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin/vdr_menu.c')
| -rw-r--r-- | muggle-plugin/vdr_menu.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/muggle-plugin/vdr_menu.c b/muggle-plugin/vdr_menu.c index fc719a7..6871eb7 100644 --- a/muggle-plugin/vdr_menu.c +++ b/muggle-plugin/vdr_menu.c @@ -268,11 +268,18 @@ mgMainMenu::mgMainMenu ():cOsdMenu ("") // Read commands for collections in etc. /video/muggle/playlist_commands.conf external_commands = new cCommands (); - char * - cmd_file = (char *) AddDirectory (cPlugin::ConfigDirectory ("muggle"), +#if VDRVERSNUM >= 10318 + cString cmd_file = AddDirectory (cPlugin::ConfigDirectory ("muggle"), "playlist_commands.conf"); - mgDebug (1, "mgMuggle::Start: Looking for file %s", cmd_file); + mgDebug (1, "mgMuggle::Start: 10318 Looking for file %s", *cmd_file); + bool have_cmd_file = external_commands->Load (*cmd_file); +#else + const char * + cmd_file = (const char *) AddDirectory (cPlugin::ConfigDirectory ("muggle"), + "playlist_commands.conf"); + mgDebug (1, "mgMuggle::Start: 10317 Looking for file %s", cmd_file); bool have_cmd_file = external_commands->Load ((const char *) cmd_file); +#endif if (!have_cmd_file) { |