libXBMC_codec.h removed and changed to libXBMC_pvr.h

AlwinEsch · Apr 29, 2017 · f3b7f77 · f3b7f77
1 parent 0e0cd45
commit f3b7f77
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
@@ -6,8 +6,7 @@
  provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
  <requires>
  <c-pluff version="0.1"/>
- <import addon="xbmc.pvr" version="5.2.1"/>
- <import addon="xbmc.codec" version="1.0.1"/>
+ <import addon="xbmc.pvr" version="5.2.2"/>
  </requires>
  <extension
  point="xbmc.pvrclient"

diff --git a/src/Tvheadend.h b/src/Tvheadend.h
@@ -26,7 +26,6 @@
 #include "p8-platform/threads/threads.h"
 #include "p8-platform/threads/mutex.h"
 #include "p8-platform/util/buffer.h"
-#include "xbmc_codec_types.h"
 #include "libXBMC_addon.h"
 #include "tvheadend/Settings.h"
 #include "HTSPTypes.h"

diff --git a/src/client.cpp b/src/client.cpp
@@ -48,7 +48,6 @@ ADDON_STATUS m_CurStatus = ADDON_STATUS_UNKNOWN;
 CMutex g_mutex;
 CHelper_libXBMC_addon *XBMC = NULL;
 CHelper_libXBMC_pvr *PVR = NULL;
-CHelper_libXBMC_codec *CODEC = NULL;
 PVR_MENUHOOK *menuHook = NULL;
 CTvheadend *tvh = NULL;
 
@@ -70,14 +69,12 @@ ADDON_STATUS ADDON_Create(void* hdl, void* props)
 
  /* Instantiate helpers */
  XBMC = new CHelper_libXBMC_addon;
- CODEC = new CHelper_libXBMC_codec;
  PVR = new CHelper_libXBMC_pvr;
 
  if (!XBMC->RegisterMe(hdl) ||
- !CODEC->RegisterMe(hdl) || !PVR->RegisterMe(hdl))
+ !PVR->RegisterMe(hdl))
  {
  SAFE_DELETE(PVR);
- SAFE_DELETE(CODEC);
  SAFE_DELETE(XBMC);
  m_CurStatus = ADDON_STATUS_PERMANENT_FAILURE;
  return m_CurStatus;
@@ -132,7 +129,6 @@ void ADDON_Destroy()
  CLockObject lock(g_mutex);
  SAFE_DELETE(tvh);
  SAFE_DELETE(PVR);
- SAFE_DELETE(CODEC);
  SAFE_DELETE(XBMC);
  SAFE_DELETE(menuHook);
  m_CurStatus = ADDON_STATUS_UNKNOWN;

diff --git a/src/client.h b/src/client.h
@@ -24,11 +24,9 @@
 #include "p8-platform/threads/mutex.h"
 #include "libXBMC_addon.h"
 #include "libXBMC_pvr.h"
-#include "libXBMC_codec.h"
 
 extern ADDON::CHelper_libXBMC_addon* XBMC;
 extern CHelper_libXBMC_pvr* PVR;
-extern CHelper_libXBMC_codec* CODEC;
 
 /* timer type ids */
 #define TIMER_ONCE_MANUAL (PVR_TIMER_TYPE_NONE + 1)

diff --git a/src/xbmc_codec_descriptor.hpp b/src/xbmc_codec_descriptor.hpp
@@ -20,7 +20,7 @@
 #ifndef XBMC_CODEC_DESCRIPTOR_HPP
 #define XBMC_CODEC_DESCRIPTOR_HPP
 
-#include "kodi/libXBMC_codec.h"
+#include "kodi/libXBMC_pvr.h"
 
 /**
  * Adapter which converts codec names used by tvheadend and VDR into their 
@@ -47,13 +47,13 @@ class CodecDescriptor
  CodecDescriptor retVal;
  // some of Tvheadend's and VDR's codec names don't match ffmpeg's, so translate them to something ffmpeg understands
  if (!strcmp(strCodecName, "MPEG2AUDIO"))
- retVal = CodecDescriptor(CODEC->GetCodecByName("MP2"), strCodecName);
+ retVal = CodecDescriptor(PVR->GetCodecByName("MP2"), strCodecName);
  else if (!strcmp(strCodecName, "MPEGTS"))
- retVal = CodecDescriptor(CODEC->GetCodecByName("MPEG2VIDEO"), strCodecName);
+ retVal = CodecDescriptor(PVR->GetCodecByName("MPEG2VIDEO"), strCodecName);
  else if (!strcmp(strCodecName, "TEXTSUB"))
- retVal = CodecDescriptor(CODEC->GetCodecByName("TEXT"), strCodecName);
+ retVal = CodecDescriptor(PVR->GetCodecByName("TEXT"), strCodecName);
  else
- retVal = CodecDescriptor(CODEC->GetCodecByName(strCodecName), strCodecName);
+ retVal = CodecDescriptor(PVR->GetCodecByName(strCodecName), strCodecName);
 
  return retVal;
  }