Index: programs/mythbackend/upnpcdsvideo.cpp
===================================================================
--- programs/mythbackend/upnpcdsvideo.cpp	(revision 0)
+++ programs/mythbackend/upnpcdsvideo.cpp	(revision 0)
@@ -0,0 +1,728 @@
+//////////////////////////////////////////////////////////////////////////////
+// Program Name: upnpcdsvideo.cpp
+//                                                                            
+// Purpose - uPnp Content Directory Extention for MythVideo Videos
+//                                                                            
+//////////////////////////////////////////////////////////////////////////////
+
+#include "upnpcdsvideo.h"
+#include "httprequest.h"
+#include <qfileinfo.h>
+#include <qregexp.h>
+#include <qurl.h>
+#include <limits.h>
+#include "util.h"
+
+/*
+   Videos                                  Videos
+    - All Videos                           Videos/All
+      + <Video 1>                          Videos/All/item?VideoID=1004
+      + <Video 2>
+      + <Video 3>
+    - By Title                             Videos/title
+      - <title 1>                          Videos/title/key=Stargate SG-1
+        + <Video 1>                        Videos/title/key=Stargate SG-1/item?VideoID=1004
+        + <Video 2>
+*/
+
+
+typedef struct
+{
+    char *title;
+    char *column;
+    char *sql;
+    char *where;
+
+} RootInfo;
+
+static RootInfo g_RootNodes[] = 
+{
+    {   "All Videos", 
+        "*",
+        "SELECT 0 as key, "
+          "CONCAT( title, ': Moo') as name, "
+          "1 as children "
+            "FROM videometadata "
+            "%1 "
+            "ORDER BY title DESC",
+        "" },
+
+    {   "By Title", 
+        "title",
+        "SELECT title as id, "
+          "title as name, "
+          "count( title ) as children "
+            "FROM videometadata "
+            "%1 "
+            "GROUP BY title "
+            "ORDER BY title", 
+        "WHERE title=:KEY" }
+
+};
+
+static const short g_nRootNodeLength = sizeof( g_RootNodes ) / sizeof( RootInfo );
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+#define SHARED_VIDEO_SQL "SELECT intid, title, director, plot, year, " \
+                                   "userrating, length, filename, "   \
+                                   "coverfile, category FROM videometadata "
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+template <class T> inline const T& Min( const T &x, const T &y ) 
+{
+    return( ( x < y ) ? x : y );
+}
+ 
+template <class T> inline const T& Max( const T &x, const T &y ) 
+{
+    return( ( x > y ) ? x : y );
+}
+                                                         
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+UPnpCDSExtensionResults *UPnpCDSVideo::Browse( UPnpCDSBrowseRequest *pRequest )
+{
+
+    // -=>TODO: Need to add Filter & Sorting Support.
+    // -=>TODO: Need to add Sub-Folder/Category Support!!!!!
+
+    if (! pRequest->m_sObjectId.startsWith( m_sExtensionId, true ))
+        return( NULL );
+
+    // ----------------------------------------------------------------------
+    // Parse out request object's path
+    // ----------------------------------------------------------------------
+
+    QStringList idPath = QStringList::split( "/", pRequest->m_sObjectId );
+
+    if (idPath.count() == 0)
+        return( NULL );
+
+    // ----------------------------------------------------------------------
+    // Process based on location in hierarchy
+    // ----------------------------------------------------------------------
+
+    UPnpCDSExtensionResults *pResults = new UPnpCDSExtensionResults();
+
+    if (pResults != NULL)
+    {
+        QString sLast = idPath.last();
+
+        pRequest->m_sParentId = RemoveToken( "/", pRequest->m_sObjectId, 1 );
+
+        if (sLast == m_sExtensionId         ) { return( ProcessRoot   ( pRequest, pResults, idPath )); }
+        if (sLast == "0"                    ) { return( ProcessAll    ( pRequest, pResults, idPath )); }
+        if (sLast.startsWith( "key" , true )) { return( ProcessKey    ( pRequest, pResults, idPath )); }
+        if (sLast.startsWith( "item", true )) { return( ProcessItem   ( pRequest, pResults, idPath )); }
+
+        int nNodeIdx = sLast.toInt();
+
+        if ((nNodeIdx > 0) && (nNodeIdx < g_nRootNodeLength))
+            return( ProcessContainer( pRequest, pResults, nNodeIdx, idPath ));
+
+        delete pResults;
+    }
+
+    return( NULL );        
+
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+QString UPnpCDSVideo::RemoveToken( const QString &sToken, const QString &sStr, int num )
+{
+    QString sResult( "" );
+    int     nPos = -1;
+
+    for (int nIdx=0; nIdx < num; nIdx++)
+    {
+        if ((nPos = sStr.findRev( sToken, nPos )) == -1)
+            break;
+    }
+
+    if (nPos > 0)
+        sResult = sStr.left( nPos );
+
+    return sResult;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+UPnpCDSExtensionResults *UPnpCDSVideo::ProcessRoot( UPnpCDSBrowseRequest    *pRequest, 
+                                                 UPnpCDSExtensionResults *pResults, 
+                                                 QStringList             &/*idPath*/ )
+{
+    pResults->m_nTotalMatches   = 0;
+    pResults->m_nUpdateID       = 1;
+
+    switch( pRequest->m_eBrowseFlag )
+    { 
+        case CDS_BrowseMetadata:
+        {
+            // --------------------------------------------------------------
+            // Return Root Object Only
+            // --------------------------------------------------------------
+
+            pResults->m_nTotalMatches   = 1;
+            pResults->m_nUpdateID       = 1;
+
+            CDSObject *pRoot = CDSObject::CreateContainer( m_sExtensionId, 
+                                                           m_sName, 
+                                                           "0");
+
+            pRoot->SetChildCount( g_nRootNodeLength );
+
+            pResults->Add( pRoot ); 
+
+            break;
+        }
+
+        case CDS_BrowseDirectChildren:
+        {
+            pResults->m_nUpdateID     = 1;
+            pResults->m_nTotalMatches = g_nRootNodeLength;
+            
+            if ( pRequest->m_nRequestedCount == 0)
+                pRequest->m_nRequestedCount = g_nRootNodeLength;
+
+            short nStart = Max( pRequest->m_nStartingIndex, short( 0 ));
+            short nEnd   = Min( g_nRootNodeLength, short( nStart + pRequest->m_nRequestedCount));
+
+            if (nStart < g_nRootNodeLength)
+            {
+                for (short nIdx = nStart; nIdx < nEnd; nIdx++)
+                {
+                    QString sId = QString( "%1/%2" ).arg( pRequest->m_sObjectId   )
+                                                    .arg( nIdx );
+
+                    CDSObject *pItem = CDSObject::CreateContainer( sId,  
+                                                                   QObject::tr( g_RootNodes[ nIdx ].title ), 
+                                                                   pRequest->m_sParentId );
+
+                    pItem->SetChildCount( GetDistinctCount( g_RootNodes[ nIdx ].column ) );
+
+                    pResults->Add( pItem );
+                }
+            }
+        }
+
+        case CDS_BrowseUnknown:
+        default:
+            break;
+    }
+
+    return( pResults );
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+UPnpCDSExtensionResults *UPnpCDSVideo::ProcessAll ( UPnpCDSBrowseRequest    *pRequest,
+                                                 UPnpCDSExtensionResults *pResults,
+                                                 QStringList             &/*idPath*/ )
+{
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+    
+    switch( pRequest->m_eBrowseFlag )
+    { 
+        case CDS_BrowseMetadata:
+        {
+            // --------------------------------------------------------------
+            // Return Container Object Only
+            // --------------------------------------------------------------
+
+            pResults->m_nTotalMatches   = 1;
+            pResults->m_nUpdateID       = 1;
+
+            CDSObject *pItem = CDSObject::CreateContainer( pRequest->m_sObjectId,  
+                                                           QObject::tr( g_RootNodes[ 0 ].title ), 
+                                                           m_sExtensionId );
+            pItem->SetChildCount( GetDistinctCount( g_RootNodes[ 0 ].column ) );
+
+            pResults->Add( pItem ); 
+
+            break;
+        }
+
+        case CDS_BrowseDirectChildren:
+        {
+
+            CreateVideoItems( pRequest, pResults, 0, "", false );
+
+            break;
+        }
+
+        case CDS_BrowseUnknown:
+        default:
+            break;
+
+    }
+    
+
+    return( pResults );
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+UPnpCDSExtensionResults *UPnpCDSVideo::ProcessItem( UPnpCDSBrowseRequest    *pRequest,
+                                                 UPnpCDSExtensionResults *pResults, 
+                                                 QStringList             &idPath )
+{
+    pResults->m_nTotalMatches   = 0;
+    pResults->m_nUpdateID       = 1;
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+    
+    if ( pRequest->m_eBrowseFlag == CDS_BrowseMetadata )
+    {
+        // --------------------------------------------------------------
+        // Return 1 VideoItem
+        // --------------------------------------------------------------
+
+        QStringMap  mapParams;
+        QString     sParams = idPath.last().section( '?', 1, 1 );
+            
+        sParams.replace(QRegExp( "&amp;"), "&" ); 
+
+        HTTPRequest::GetParameters( sParams, mapParams );
+
+        int     nVideoID    = mapParams[ "VideoID"    ].toInt();
+
+        MSqlQuery query(MSqlQuery::InitCon());
+
+        if (query.isConnected())                                                           
+        {
+            query.prepare( SHARED_VIDEO_SQL
+                           "WHERE intid=:VIDEOID " );
+
+            query.bindValue(":VIDEOID"   , (int)nVideoID    );
+            query.exec();
+
+            if (query.isActive() && query.size() > 0)
+            {
+                if ( query.next() )
+                {
+                    pRequest->m_sObjectId = RemoveToken( "/", pRequest->m_sObjectId, 1 );
+
+                    AddVideoItem( pRequest, pResults, false, query );
+                    pResults->m_nTotalMatches = 1;
+                }
+            }
+        }
+    }
+
+    return( pResults );
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+UPnpCDSExtensionResults *UPnpCDSVideo::ProcessKey( UPnpCDSBrowseRequest    *pRequest,
+                                                UPnpCDSExtensionResults *pResults, 
+                                                QStringList             &idPath )
+{
+    pResults->m_nTotalMatches   = 0;
+    pResults->m_nUpdateID       = 1;
+
+    // ----------------------------------------------------------------------
+    //
+    // ----------------------------------------------------------------------
+    
+    QString sKey = idPath.last().section( '=', 1, 1 );
+    QUrl::decode( sKey );
+
+    if (sKey.length() > 0)
+    {
+        int nNodeIdx = idPath[ idPath.count() - 2 ].toInt();
+
+        switch( pRequest->m_eBrowseFlag )
+        { 
+
+            case CDS_BrowseMetadata:
+            {                                    
+                // --------------------------------------------------------------
+                // Since Key is not always the title, we need to lookup title.
+                // --------------------------------------------------------------
+
+                MSqlQuery query(MSqlQuery::InitCon());
+
+                if (query.isConnected())
+                {
+                    QString sSQL   = QString( g_RootNodes[ nNodeIdx ].sql )
+                                        .arg( g_RootNodes[ nNodeIdx ].where );
+
+                    query.prepare  ( sSQL );
+                    query.bindValue( ":KEY", sKey );
+                    query.exec();
+
+                    if (query.isActive() && query.size() > 0)
+                    {
+                        if ( query.next() )
+                        {
+                            // ----------------------------------------------
+                            // Return Container Object Only
+                            // ----------------------------------------------
+
+                            pResults->m_nTotalMatches   = 1;
+                            pResults->m_nUpdateID       = 1;
+
+                            CDSObject *pItem = CDSObject::CreateContainer( pRequest->m_sObjectId,  
+                                                                           query.value(1).toString(), 
+                                                                           pRequest->m_sParentId );
+
+                            pItem->SetChildCount( GetDistinctCount( g_RootNodes[ nNodeIdx ].column  ));
+
+                            pResults->Add( pItem ); 
+                        }
+                    }
+                }
+                break;
+            }
+
+            case CDS_BrowseDirectChildren:
+            {
+                CreateVideoItems( pRequest, pResults, nNodeIdx, sKey, true );
+
+                break;
+            }
+
+            case CDS_BrowseUnknown:
+                default:
+                break;
+        }
+    }
+
+    return( pResults );                                                                           
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+UPnpCDSExtensionResults *UPnpCDSVideo::ProcessContainer( UPnpCDSBrowseRequest    *pRequest,
+                                                      UPnpCDSExtensionResults *pResults,
+                                                      int                      nNodeIdx,
+                                                      QStringList             &/*idPath*/ )
+
+{
+    pResults->m_nUpdateID     = 1;
+    pResults->m_nTotalMatches = 0;
+
+    switch( pRequest->m_eBrowseFlag )
+    { 
+        case CDS_BrowseMetadata:
+        {
+            // --------------------------------------------------------------
+            // Return Container Object Only
+            // --------------------------------------------------------------
+
+            pResults->m_nTotalMatches   = 1;
+            pResults->m_nUpdateID       = 1;
+
+            CDSObject *pItem = CDSObject::CreateContainer( pRequest->m_sObjectId,  
+                                                           QObject::tr( g_RootNodes[ nNodeIdx ].title ), 
+                                                           m_sExtensionId );
+
+            pItem->SetChildCount( GetDistinctCount( g_RootNodes[ nNodeIdx ].column ));
+
+            pResults->Add( pItem ); 
+
+            break;
+        }
+
+        case CDS_BrowseDirectChildren:
+        {
+            pResults->m_nTotalMatches = GetDistinctCount( g_RootNodes[ nNodeIdx ].column );
+            pResults->m_nUpdateID     = 1;
+
+            if (pRequest->m_nRequestedCount == 0) 
+                pRequest->m_nRequestedCount = SHRT_MAX;
+
+            MSqlQuery query(MSqlQuery::InitCon());
+
+            if (query.isConnected())
+            {
+                // Remove where clause placeholder.
+
+                QString sSQL = g_RootNodes[ nNodeIdx ].sql;
+                sSQL.replace( "%1", "" );
+
+                sSQL += QString( " LIMIT %2, %3" )
+                           .arg( pRequest->m_nStartingIndex  )
+                           .arg( pRequest->m_nRequestedCount );
+
+                query.prepare( sSQL );
+                query.exec();
+
+                if (query.isActive() && query.size() > 0)
+                {
+
+                    while(query.next())
+                    {
+                        QString sKey   = query.value(0).toString();
+                        QString sTitle = query.value(1).toString();
+                        long    nCount = query.value(2).toInt();
+
+                        if (sTitle.length() == 0)
+                            sTitle = "(undefined)";
+
+                        QString sId = QString( "%1/%2/key=%3" )
+                                         .arg( pRequest->m_sParentId )
+                                         .arg( nNodeIdx )
+                                         .arg( sKey );
+
+                        CDSObject *pRoot = CDSObject::CreateContainer( sId, sTitle, pRequest->m_sParentId );
+
+                        pRoot->SetChildCount( nCount );
+
+                        pResults->Add( pRoot ); 
+                    }
+                }
+            }
+
+            break;
+        }
+    }
+
+    return( pResults );
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+int UPnpCDSVideo::GetDistinctCount( const QString &sColumn )
+{
+    int nCount = 0;
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    if (query.isConnected())
+    {
+        // Note: Tried to use Bind, however it would not allow me to use it
+        //       for column & table names
+
+        QString sSQL;
+        
+        if (sColumn == "*")
+            sSQL = QString( "SELECT count( %1 ) FROM videometadata" ).arg( sColumn );
+        else
+            sSQL = QString( "SELECT count( DISTINCT %1 ) FROM videometadata" ).arg( sColumn );
+
+        query.prepare( sSQL );
+        query.exec();
+
+        if (query.size() > 0)
+        {
+            query.next();
+
+            nCount = query.value(0).toInt();
+        }
+    }
+
+    return( nCount );
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+int UPnpCDSVideo::GetCount( const QString &sColumn, const QString &sKey )
+{
+    int nCount = 0;
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    if (query.isConnected())
+    {
+        // Note: Tried to use Bind, however it would not allow me to use it
+        //       for column & table names
+
+        QString sSQL;
+        
+        if (sColumn == "*")
+            sSQL = "SELECT count( * ) FROM videometadata";
+        else
+            sSQL = QString( "SELECT count( %1 ) FROM videometadata WHERE %2=:KEY" )
+                      .arg( sColumn )
+                      .arg( sColumn );
+
+        query.prepare( sSQL );
+        query.bindValue( ":KEY", sKey );
+        query.exec();
+
+        if (query.size() > 0)
+        {
+            query.next();
+
+            nCount = query.value(0).toInt();
+        }
+
+    }
+
+    return( nCount );
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+void UPnpCDSVideo::CreateVideoItems( UPnpCDSBrowseRequest    *pRequest,
+                                  UPnpCDSExtensionResults *pResults,
+                                  int                      nNodeIdx,
+                                  const QString           &sKey, 
+                                  bool                     bAddRef )
+{
+
+    pResults->m_nTotalMatches = GetCount( g_RootNodes[ nNodeIdx ].column, sKey );
+    pResults->m_nUpdateID     = 1;
+
+    if (pRequest->m_nRequestedCount == 0) 
+        pRequest->m_nRequestedCount = SHRT_MAX;
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    if (query.isConnected())
+    {
+        QString sWhere( "" );
+
+        if ( sKey.length() > 0)
+        {
+           sWhere = QString( "WHERE %1=:KEY " )
+                       .arg( g_RootNodes[ nNodeIdx ].column );
+        }
+
+        QString sSQL = QString( SHARED_VIDEO_SQL 
+                                "%1 "
+                                "LIMIT %2, %3" )
+                          .arg( sWhere )
+                          .arg( pRequest->m_nStartingIndex  )
+                          .arg( pRequest->m_nRequestedCount );
+
+        query.prepare  ( sSQL );
+        query.bindValue(":KEY", sKey );
+        query.exec();
+
+        if (query.isActive() && query.size() > 0)
+        {
+            while(query.next())
+                AddVideoItem( pRequest, pResults, bAddRef, query );
+        }
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+void UPnpCDSVideo::AddVideoItem( UPnpCDSBrowseRequest    *pRequest,
+                              UPnpCDSExtensionResults *pResults,
+                              bool                     bAddRef,
+                              MSqlQuery               &query )
+{
+    int            nVidID       = query.value( 0).toInt();
+    QString        sTitle       = query.value( 1).toString();
+    QString        sDirector    = query.value( 2).toString();
+    QString        sDescription = query.value( 3).toString();
+    int            nYear        = query.value( 4).toInt();
+    QString        sUserRating  = query.value( 5).toString();
+    long long      nFileSize    = stringToLongLong( query.value( 6).toString() );
+    QString        sFileName    = query.value( 7).toString();
+    QString        sCover       = query.value( 8).toString();
+    int            nCategory    = query.value( 9).toInt();
+
+    // ----------------------------------------------------------------------
+    // Cache Host ip Address & Port
+    // ----------------------------------------------------------------------
+    QString sServerIp = gContext->GetSetting( "BackendServerIp"  );
+    QString sPort     = gContext->GetSetting("BackendStatusPort" );
+
+    // ----------------------------------------------------------------------
+    // Build Support Strings
+    // ----------------------------------------------------------------------
+
+    QString sName      = sTitle;
+
+    QString sURIBase   = QString( "http://%1:%2/" )
+                            .arg( sServerIp )
+                            .arg( sPort     );
+
+    QString sURIParams = QString( "?VideoID=%1&amp" )
+                            .arg( nVidID );
+
+    QString sId        = QString( "%1/item%2")
+                            .arg( pRequest->m_sObjectId )
+                            .arg( sURIParams );
+
+    CDSObject *pItem   = CDSObject::CreateVideoItem( sId, 
+                                                     sName, 
+                                                     pRequest->m_sParentId );
+    pItem->m_bRestricted  = false;
+    pItem->m_bSearchable  = true;
+    pItem->m_sWriteStatus = "WRITABLE";
+
+    if ( bAddRef )
+    {
+        QString sRefId = QString( "%1/0/item%2")
+                            .arg( m_sExtensionId )
+                            .arg( sURIParams     );
+
+        pItem->SetPropValue( "refID", sRefId );
+    }
+
+    //pItem->SetPropValue( "genre"          , sCategory    );
+    pItem->SetPropValue( "longDescription", sDescription );
+    pItem->SetPropValue( "description"    , sDescription    );
+
+    //pItem->SetPropValue( "producer"       , );
+    //pItem->SetPropValue( "rating"         , );
+    //pItem->SetPropValue( "actor"          , );
+    //pItem->SetPropValue( "director"       , );
+    //pItem->SetPropValue( "publisher"      , );
+    //pItem->SetPropValue( "language"       , );
+    //pItem->SetPropValue( "relation"       , );
+    //pItem->SetPropValue( "region"         , );
+
+    pResults->Add( pItem );
+
+    // ----------------------------------------------------------------------
+    // Add Video Resource Element based on File extension (HTTP)
+    // ----------------------------------------------------------------------
+    
+    QFileInfo fInfo( sFileName );
+
+    QString sMimeType = HTTPRequest::GetMimeType( fInfo.extension( FALSE ));
+    QString sProtocol = QString( "http-get:*:%1:*" ).arg( sMimeType  );
+    QString sURI      = QString( "%1getVideo%2").arg( sURIBase   )
+                                                    .arg( sURIParams ); 
+
+    Resource *pRes = pItem->AddResource( sProtocol, sURI );
+
+   // Wonder if we should add the filesize to videometadata. would make this cleaner since we 
+   // are hitting the db for everything else.
+
+    pRes->AddAttribute( "size"      , QString("%1").arg(fInfo.size()) );
+
+}
+
Index: programs/mythbackend/mythbackend.pro
===================================================================
--- programs/mythbackend/mythbackend.pro	(revision 11506)
+++ programs/mythbackend/mythbackend.pro	(working copy)
@@ -14,12 +14,12 @@
 # Input
 HEADERS += autoexpire.h encoderlink.h filetransfer.h httpstatus.h mainserver.h
 HEADERS += playbacksock.h scheduler.h server.h housekeeper.h
-HEADERS += upnpcdstv.h upnpcdsmusic.h
+HEADERS += upnpcdstv.h upnpcdsmusic.h upnpcdsvideo.h
 
 SOURCES += autoexpire.cpp encoderlink.cpp filetransfer.cpp httpstatus.cpp
 SOURCES += main.cpp mainserver.cpp playbacksock.cpp scheduler.cpp server.cpp
 SOURCES += housekeeper.cpp
-SOURCES += upnpcdstv.cpp upnpcdsmusic.cpp
+SOURCES += upnpcdstv.cpp upnpcdsmusic.cpp upnpcdsvideo.cpp
 
 using_oss:DEFINES += USING_OSS
 
Index: programs/mythbackend/upnpcdsvideo.h
===================================================================
--- programs/mythbackend/upnpcdsvideo.h	(revision 0)
+++ programs/mythbackend/upnpcdsvideo.h	(revision 0)
@@ -0,0 +1,92 @@
+//////////////////////////////////////////////////////////////////////////////
+// Program Name: upnpcdstv.h
+//                                                                            
+// Purpose - uPnp Content Directory Extention for Recorded TV 
+//                                                                            
+// Created By  : David Blain                    Created On : Jan. 24, 2005
+// Modified By :                                Modified On:                  
+//                                                                            
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef UPnpCDSVIDEO_H_
+#define UPnpCDSVIDEO_H_
+
+#include "mainserver.h"
+#include "upnpcds.h"
+              
+//using namespace UPnp;
+
+typedef QMap< QString, QString > StringMap;
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//////////////////////////////////////////////////////////////////////////////
+
+class UPnpCDSVideo : public UPnpCDSExtension
+{
+    private:
+
+        StringMap    m_mapBackendIp;
+        StringMap    m_mapBackendPort;
+
+    private:
+
+        QString RemoveToken ( const QString &sToken, const QString &sStr, int num );
+
+        int  GetDistinctCount      ( const QString &sColumn );
+        int  GetCount              ( const QString &sColumn, const QString &sKey );
+
+        void BuildContainerChildren( UPnpCDSExtensionResults *pResults, 
+                                     int                      nNodeIdx,
+                                     const QString           &sParentId,
+                                     short                    nStartingIndex,
+                                     short                    nRequestedCount );
+
+        void CreateVideoItems      ( UPnpCDSBrowseRequest    *pRequest,
+                                     UPnpCDSExtensionResults *pResults,
+                                     int                      nNodeIdx,
+                                     const QString           &sKey, 
+                                     bool                     bAddRef );
+
+        void AddVideoItem          ( UPnpCDSBrowseRequest    *pRequest,
+                                     UPnpCDSExtensionResults *pResults,
+                                     bool                     bAddRef, 
+                                     MSqlQuery               &query );
+
+        UPnpCDSExtensionResults *ProcessRoot     ( UPnpCDSBrowseRequest    *pRequest, 
+                                                   UPnpCDSExtensionResults *pResults,
+                                                   QStringList             &idPath );
+        UPnpCDSExtensionResults *ProcessAll      ( UPnpCDSBrowseRequest    *pRequest, 
+                                                   UPnpCDSExtensionResults *pResults,
+                                                   QStringList             &idPath );
+        UPnpCDSExtensionResults *ProcessItem     ( UPnpCDSBrowseRequest    *pRequest,
+                                                   UPnpCDSExtensionResults *pResults,
+                                                   QStringList             &idPath );
+        UPnpCDSExtensionResults *ProcessKey      ( UPnpCDSBrowseRequest    *pRequest,
+                                                   UPnpCDSExtensionResults *pResults,
+                                                   QStringList             &idPath );
+        UPnpCDSExtensionResults *ProcessContainer( UPnpCDSBrowseRequest    *pRequest,
+                                                   UPnpCDSExtensionResults *pResults,
+                                                   int                      nNodeIdx,
+                                                   QStringList             &idPath );
+
+
+    public:
+
+        UPnpCDSVideo( ) : UPnpCDSExtension( "Videos", "Videos" )
+        {
+        }
+
+        virtual ~UPnpCDSVideo() {}
+
+        virtual UPnpCDSExtensionResults *Browse( UPnpCDSBrowseRequest *pRequest );
+        virtual UPnpCDSExtensionResults *Search( UPnpCDSSearchRequest * /* pRequest */ )
+        { 
+            return( NULL );
+        }
+
+        virtual QString GetSearchCapabilities() { return( "" ); }
+        virtual QString GetSortCapabilities  () { return( "" ); }
+};
+
+#endif
Index: programs/mythbackend/httpstatus.cpp
===================================================================
--- programs/mythbackend/httpstatus.cpp	(revision 11506)
+++ programs/mythbackend/httpstatus.cpp	(working copy)
@@ -73,6 +73,7 @@
     if (sURI == "getExpiring"          ) return( HSM_GetExpiring     );
     if (sURI == "getPreviewImage"      ) return( HSM_GetPreviewImage );
     if (sURI == "getRecording"         ) return( HSM_GetRecording    );
+    if (sURI == "getVideo"             ) return( HSM_GetVideo        );
     if (sURI == "getMusic"             ) return( HSM_GetMusic        );
 
     if (sURI == "getDeviceDesc"        ) return( HSM_GetDeviceDesc   );
@@ -118,6 +119,8 @@
 
                 case HSM_GetRecording   : GetRecording   ( pThread, pRequest ); return( true );
                 case HSM_GetMusic       : GetMusic       ( pThread, pRequest ); return( true );
+                case HSM_GetVideo       : GetVideo       ( pThread, pRequest ); return( true );
+
                 default: break;
             }
         }
@@ -1066,7 +1069,83 @@
     }
 }
 
+void HttpStatus::GetVideo( HttpWorkerThread *pThread,
+                           HTTPRequest      *pRequest )
+{
+    pRequest->m_eResponseType   = ResponseTypeHTML;
+    pRequest->m_mapRespHeaders[ "Cache-Control" ] = "no-cache=\"Ext\", max-age = 5000";
+    pRequest->m_nResponseStatus = 404;
 
+    QString sId   = pRequest->m_mapParams[ "VideoID"    ];
+
+    if (sId.length() == 0) 
+        return;
+
+    // ----------------------------------------------------------------------
+    // Check to see if this is another request for the same recording...
+    // ----------------------------------------------------------------------
+
+    ThreadData *pData = (ThreadData *)pThread->GetWorkerData();
+
+    if ((pData != NULL) && (pData->m_eType == ThreadData::DT_Video))
+    {
+        if (pData->m_sVideoID == sId )
+           pRequest->m_sFileName = pData->m_sFileName;
+        else
+           pData = NULL;
+
+    }
+
+    // ----------------------------------------------------------------------
+    // New request if pData == NULL
+    // ----------------------------------------------------------------------
+
+    if (pData == NULL)
+    {
+        QString sBasePath = "";
+
+        // ------------------------------------------------------------------
+        // Load Track's FileName
+        // ------------------------------------------------------------------
+
+        MSqlQuery query(MSqlQuery::InitCon());
+
+        if (query.isConnected())
+        {
+            query.prepare("SELECT filename FROM videometadata WHERE intid = :KEY" );
+            query.bindValue(":KEY", sId );
+            query.exec();
+
+            if (query.isActive() && query.size() > 0)
+            {
+                query.first();
+                pRequest->m_sFileName = QString( "%1/%2" )
+                                           .arg( sBasePath )
+                                           .arg( query.value(0).toString() );
+            }
+        }
+
+        // ------------------------------------------------------------------
+        // Store information in WorkerThread Storage for next request (cache)
+        // ------------------------------------------------------------------
+
+        pData = new ThreadData( sId, pRequest->m_sFileName );
+
+        pThread->SetWorkerData( pData );
+    }
+
+    // ----------------------------------------------------------------------
+    // check to see if the file exists
+    // ----------------------------------------------------------------------
+
+    if (QFile::exists( pRequest->m_sFileName ))
+    {
+        pRequest->m_eResponseType   = ResponseTypeFile;
+        pRequest->m_nResponseStatus = 200;
+    }
+}
+
+
 /////////////////////////////////////////////////////////////////////////////
 //
 /////////////////////////////////////////////////////////////////////////////
Index: programs/mythbackend/main.cpp
===================================================================
--- programs/mythbackend/main.cpp	(revision 11506)
+++ programs/mythbackend/main.cpp	(working copy)
@@ -38,6 +38,7 @@
 
 #include "upnpcdstv.h"
 #include "upnpcdsmusic.h"
+#include "upnpcdsvideo.h"
 #include "httpstatus.h"
 
 QMap<int, EncoderLink *> tvList;
@@ -650,6 +651,11 @@
         VERBOSE(VB_UPNP, "Main::Registering UPnpCDSMusic Extension");
 
         g_pUPnp->RegisterExtension(new UPnpCDSMusic());
+
+        VERBOSE(VB_UPNP, "Main::Registering UPnpCDSVideo Extension");
+
+        g_pUPnp->RegisterExtension(new UPnpCDSVideo());
+
     }
     // End uPnP &  Mini HttpServer Initialization
 
Index: programs/mythbackend/httpstatus.h
===================================================================
--- programs/mythbackend/httpstatus.h	(revision 11506)
+++ programs/mythbackend/httpstatus.h	(working copy)
@@ -48,8 +48,10 @@
     HSM_Asterisk        = 16,
 
     HSM_GetExpiring       = 17,
-    HSM_GetProgramDetails = 18
+    HSM_GetProgramDetails = 18,
 
+    HSM_GetVideo        = 19
+
 } HttpStatusMethod;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -68,8 +70,10 @@
         {
             DT_Unknown   = 0,
             DT_Recording = 1,
-            DT_Music     = 2
+            DT_Music     = 2,
+            DT_Video     = 3
 
+
         } ThreadDataType;
         
 
@@ -78,6 +82,7 @@
         QString         m_sChanId;   
         QString         m_sStartTime;
         QString         m_sFileName;
+        QString         m_sVideoID;
 
         int             m_nTrackNumber;
 
@@ -100,6 +105,15 @@
             m_sFileName  = sFileName;
         }
 
+        ThreadData( const QString &sVideoID,
+                    const QString &sFileName )
+        {
+            m_eType      = DT_Video;
+            m_sVideoID   = sVideoID;
+            m_sFileName  = sFileName;
+        }
+
+
         virtual ~ThreadData() 
         {
         }
@@ -157,6 +171,9 @@
         void    GetMusic       ( HttpWorkerThread *pThread, 
                                  HTTPRequest      *pRequest );
 
+        void    GetVideo       ( HttpWorkerThread *pThread,
+                                 HTTPRequest      *pRequest );
+
         void    GetDeviceDesc  ( HTTPRequest *pRequest ); 
         void    GetFile        ( HTTPRequest *pRequest, QString sFileName );