diff options
| -rw-r--r-- | vdr_menu.c | 13 | ||||
| -rw-r--r-- | vdr_player.c | 12 |
2 files changed, 22 insertions, 3 deletions
@@ -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) { diff --git a/vdr_player.c b/vdr_player.c index b281746..1375a5e 100644 --- a/vdr_player.c +++ b/vdr_player.c @@ -643,7 +643,11 @@ mgDebug( 1, "mgPCMPlayer::Action: music file is %s", filename.c_str() ); if (m_pframe) { +#if VDRVERSNUM >= 10318 + int w = PlayPes (p, pc); +#else int w = PlayVideo (p, pc); +#endif if (w > 0) { p += w; @@ -1111,7 +1115,11 @@ pes_header[6] = 0x0f; } memcpy(&pes_header[6 + ptslen], data, payload_size); +#if VDRVERSNUM >= 10318 +PlayPes(pes_header, 6 + ptslen + payload_size); +#else PlayVideo(pes_header, 6 + ptslen + payload_size); +#endif len -= payload_size; data += payload_size; @@ -1325,7 +1333,11 @@ mgPlayerControl::ShowContents () { int len = player->getCurrent ()->getDuration (); asprintf (&buf, "Length:\t%s", +#if VDRVERSNUM >= 10318 + *IndexToHMSF (SecondsToFrames (len))); +#else IndexToHMSF (SecondsToFrames (len))); +#endif m_menu->SetItem (buf, 4, false, false); free (buf); } |