Remove GetFilteredLiveStreamList() and add the filtering parameter to

GetLiveStreamList(). They used the same funtion internally. This also makes it consistent with all of the other Get*List() calls after GetFilteredRecordedList() was similarly removed.
MythTV · Jul 1, 2013 · 14bb408 · 14bb408
1 parent 0254ef8
commit 14bb408
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/mythtv/libs/libmythservicecontracts/services/contentServices.h b/mythtv/libs/libmythservicecontracts/services/contentServices.h
@@ -39,7 +39,7 @@
 class SERVICE_PUBLIC ContentServices : public Service  //, public QScriptable ???
 {
     Q_OBJECT
-    Q_CLASSINFO( "version"    , "1.32" );
+    Q_CLASSINFO( "version"    , "1.33" );
     Q_CLASSINFO( "DownloadFile_Method",            "POST" )
 
     public:
@@ -130,8 +130,7 @@ class SERVICE_PUBLIC ContentServices : public Service  //, public QScriptable ??
                                                                   int              SampleRate ) = 0;
 
         virtual DTC::LiveStreamInfo     *GetLiveStream            ( int Id ) = 0;
-        virtual DTC::LiveStreamInfoList *GetLiveStreamList        ( void ) = 0;
-        virtual DTC::LiveStreamInfoList *GetFilteredLiveStreamList( const QString &FileName ) = 0;
+        virtual DTC::LiveStreamInfoList *GetLiveStreamList        ( const QString &FileName ) = 0;
 
         virtual DTC::LiveStreamInfo     *StopLiveStream         ( int Id ) = 0;
         virtual bool                     RemoveLiveStream       ( int Id ) = 0;

diff --git a/mythtv/programs/mythbackend/services/content.cpp b/mythtv/programs/mythbackend/services/content.cpp
@@ -911,16 +911,7 @@ DTC::LiveStreamInfo *Content::GetLiveStream( int nId )
 //
 /////////////////////////////////////////////////////////////////////////////
 
-DTC::LiveStreamInfoList *Content::GetLiveStreamList( void )
-{
-    return HTTPLiveStream::GetLiveStreamInfoList();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//
-/////////////////////////////////////////////////////////////////////////////
-
-DTC::LiveStreamInfoList *Content::GetFilteredLiveStreamList( const QString   &FileName )
+DTC::LiveStreamInfoList *Content::GetLiveStreamList( const QString   &FileName )
 {
     return HTTPLiveStream::GetLiveStreamInfoList(FileName);
 }

diff --git a/mythtv/programs/mythbackend/services/content.h b/mythtv/programs/mythbackend/services/content.h
@@ -114,8 +114,7 @@ class Content : public ContentServices
                                                           int              SampleRate );
 
         DTC::LiveStreamInfo     *GetLiveStream            ( int Id );
-        DTC::LiveStreamInfoList *GetLiveStreamList        ( void );
-        DTC::LiveStreamInfoList *GetFilteredLiveStreamList( const QString &FileName );
+        DTC::LiveStreamInfoList *GetLiveStreamList        ( const QString &FileName );
 
         DTC::LiveStreamInfo     *StopLiveStream         ( int Id );
         bool                     RemoveLiveStream       ( int Id );
@@ -172,14 +171,9 @@ class ScriptableContent : public QObject
             return m_obj.GetLiveStream( Id );
         }
 
-        QObject* GetLiveStreamList(  void )
+        QObject* GetLiveStreamList(  const QString &FileName )
         {
-            return m_obj.GetLiveStreamList();
-        }
-
-        QObject* GetFilteredLiveStreamList(  const QString &FileName )
-        {
-            return m_obj.GetFilteredLiveStreamList( FileName );
+            return m_obj.GetLiveStreamList( FileName );
         }
 };