XBMC Media Center

Revision: 23272
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23272&view=rev
Author:   vdrfan
Date:     2009-09-30 18:18:15 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
changed: perform startup scans after logging in if we're using the login screen (Fixes #7245)

Modified Paths:
--------------
    trunk/xbmc/Application.cpp
    trunk/xbmc/Application.h
    trunk/xbmc/GUIWindowLoginScreen.cpp

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-09-30 17:29:33 UTC (rev 23271)
+++ trunk/xbmc/Application.cpp	2009-09-30 18:18:15 UTC (rev 23272)
@@ -1297,28 +1297,13 @@
     RestoreMusicScanSettings();
   }
 
-  if (g_guiSettings.GetBool("videolibrary.updateonstartup"))
-  {
-    CLog::Log(LOGNOTICE, "Updating video library on startup");
-    CGUIDialogVideoScan *scanner = (CGUIDialogVideoScan *)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
-    SScraperInfo info;
-    VIDEO::SScanSettings settings;
-    if (scanner && !scanner->IsScanning())
-      scanner->StartScanning("",info,settings,false);
-  }
+  if (!g_settings.bUseLoginScreen)
+    UpdateLibraries();
 
 #ifdef HAS_HAL
   g_HalManager.Initialize();
 #endif
 
-  if (g_guiSettings.GetBool("musiclibrary.updateonstartup"))
-  {
-    CLog::Log(LOGNOTICE, "Updating music library on startup");
-    CGUIDialogMusicScan *scanner = (CGUIDialogMusicScan *)m_gWindowManager.GetWindow(WINDOW_DIALOG_MUSIC_SCAN);
-    if (scanner && !scanner->IsScanning())
-      scanner->StartScanning("");
-  }
-
   m_slowTimer.StartZero();
 
 #ifdef __APPLE__
@@ -5314,6 +5299,27 @@
   g_settings.Save();
 }
 
+void CApplication::UpdateLibraries()
+{
+  if (g_guiSettings.GetBool("videolibrary.updateonstartup"))
+  {
+    CLog::Log(LOGNOTICE, "%s - Starting video library startup scan", __FUNCTION__);
+    CGUIDialogVideoScan *scanner = (CGUIDialogVideoScan *)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
+    SScraperInfo info;
+    VIDEO::SScanSettings settings;
+    if (scanner && !scanner->IsScanning())
+      scanner->StartScanning("",info,settings,false);
+  }
+ 
+  if (g_guiSettings.GetBool("musiclibrary.updateonstartup"))
+  {
+    CLog::Log(LOGNOTICE, "%s - Starting music library startup scan", __FUNCTION__);
+    CGUIDialogMusicScan *scanner = (CGUIDialogMusicScan *)m_gWindowManager.GetWindow(WINDOW_DIALOG_MUSIC_SCAN);
+    if (scanner && !scanner->IsScanning())
+      scanner->StartScanning("");
+  }
+}
+
 void CApplication::CheckPlayingProgress()
 {
   // check if we haven't rewound past the start of the file

Modified: trunk/xbmc/Application.h
===================================================================
--- trunk/xbmc/Application.h	2009-09-30 17:29:33 UTC (rev 23271)
+++ trunk/xbmc/Application.h	2009-09-30 18:18:15 UTC (rev 23272)
@@ -190,6 +190,7 @@
 
   void SaveMusicScanSettings();
   void RestoreMusicScanSettings();
+  void UpdateLibraries();
   void CheckMusicPlaylist();
 
   bool ExecuteXBMCAction(std::string action);

Modified: trunk/xbmc/GUIWindowLoginScreen.cpp
===================================================================
--- trunk/xbmc/GUIWindowLoginScreen.cpp	2009-09-30 17:29:33 UTC (rev 23271)
+++ trunk/xbmc/GUIWindowLoginScreen.cpp	2009-09-30 18:18:15 UTC (rev 23272)
@@ -139,6 +139,8 @@
               m_gWindowManager.ActivateWindow(g_guiSettings.GetInt("lookandfeel.startupwindow"));
             }
 
+            g_application.UpdateLibraries();
+
             return true;
           }
           else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 23279
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23279&view=rev
Author:   vdrfan
Date:     2009-09-30 22:34:22 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
cosmetics: cleanup for the sake of consistency

Modified Paths:
--------------
    trunk/xbmc/GUIWindowVideoBase.cpp
    trunk/xbmc/MusicDatabase.cpp
    trunk/xbmc/MusicDatabase.h
    trunk/xbmc/VideoDatabase.cpp
    trunk/xbmc/VideoDatabase.h
    trunk/xbmc/VideoInfoScanner.cpp
    trunk/xbmc/VideoInfoScanner.h

Modified: trunk/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/xbmc/GUIWindowVideoBase.cpp	2009-09-30 22:31:16 UTC (rev 23278)
+++ trunk/xbmc/GUIWindowVideoBase.cpp	2009-09-30 22:34:22 UTC (rev 23279)
@@ -413,14 +413,14 @@
         return false;
       }
 
-      long lEpisodeHint=-1;
+      int EpisodeHint=-1;
       if (item->HasVideoInfoTag())
-        lEpisodeHint = item->GetVideoInfoTag()->m_iEpisode;
-      long lEpisodeId=-1;
-      if ((lEpisodeId = m_database.GetEpisodeId(item->m_strPath,lEpisodeHint)) > -1)
+        EpisodeHint = item->GetVideoInfoTag()->m_iEpisode;
+      int idEpisode=-1;
+      if ((idEpisode = m_database.GetEpisodeId(item->m_strPath,EpisodeHint)) > -1)
       {
         bHasInfo = true;
-        m_database.GetEpisodeInfo(item->m_strPath, movieDetails, lEpisodeId);
+        m_database.GetEpisodeInfo(item->m_strPath, movieDetails, idEpisode);
       }
     }
   }
@@ -1719,8 +1719,8 @@
 
   // everything is ok, so add to database
   m_database.Open();
-  long lMovieId = m_database.AddMovie(pItem->m_strPath);
-  movie.m_strIMDBNumber.Format("xx%08i", lMovieId);
+  int idMovie = m_database.AddMovie(pItem->m_strPath);
+  movie.m_strIMDBNumber.Format("xx%08i", idMovie);
   m_database.SetDetailsForMovie(pItem->m_strPath, movie);
   m_database.Close();
 

Modified: trunk/xbmc/MusicDatabase.cpp
===================================================================
--- trunk/xbmc/MusicDatabase.cpp	2009-09-30 22:31:16 UTC (rev 23278)
+++ trunk/xbmc/MusicDatabase.cpp	2009-09-30 22:34:22 UTC (rev 23279)
@@ -225,25 +225,25 @@
 
     // add the primary artist/genre
     // SplitString returns >= 1 so no worries referencing the first item here
-    int lArtistId = AddArtist(vecArtists[0]);
-    int lGenreId = AddGenre(vecGenres[0]);
+    int idArtist = AddArtist(vecArtists[0]);
+    int idGenre = AddGenre(vecGenres[0]);
     // and also the primary album artist (if applicable)
-    int lAlbumArtistId = -1;
+    int idAlbumArtist = -1;
     if (!vecAlbumArtists[0].IsEmpty())
-      lAlbumArtistId = AddArtist(vecAlbumArtists[0]);
+      idAlbumArtist = AddArtist(vecAlbumArtists[0]);
 
-    int lPathId = AddPath(strPath);
-    int lThumbId = AddThumb(song.strThumb);
-    int lAlbumId;
-    if (lAlbumArtistId > -1)  // have an album artist
-      lAlbumId = AddAlbum(song.strAlbum, lAlbumArtistId, extraAlbumArtists, song.strAlbumArtist, lThumbId, lGenreId, extraGenres, song.iYear);
+    int idPath = AddPath(strPath);
+    int idThumb = AddThumb(song.strThumb);
+    int idAlbum;
+    if (idAlbumArtist > -1)  // have an album artist
+      idAlbum = AddAlbum(song.strAlbum, idAlbumArtist, extraAlbumArtists, song.strAlbumArtist, idThumb, idGenre, extraGenres, song.iYear);
     else
-      lAlbumId = AddAlbum(song.strAlbum, lArtistId, extraArtists, song.strArtist, lThumbId, lGenreId, extraGenres, song.iYear);
+      idAlbum = AddAlbum(song.strAlbum, idArtist, extraArtists, song.strArtist, idThumb, idGenre, extraGenres, song.iYear);
 
     DWORD crc = ComputeCRC(song.strFileName);
 
     bool bInsert = true;
-    int lSongId = -1;
+    int idSong = -1;
     bool bHasKaraoke = false;
 #ifdef HAS_KARAOKE
     bHasKaraoke = CKaraokeLyricsFactory::HasLyrics( song.strFileName );
@@ -251,19 +251,19 @@
 
     // If this is karaoke song, change the genre to 'Karaoke' (and add it if it's not there)
     if ( bHasKaraoke && g_advancedSettings.m_karaokeChangeGenreForKaraokeSongs )
-      lGenreId = AddGenre( "Karaoke" );
+      idGenre = AddGenre( "Karaoke" );
 
     if (bCheck)
     {
       strSQL=FormatSQL("select * from song where idAlbum=%i and dwFileNameCRC='%ul' and strTitle='%s'",
-                    lAlbumId, crc, song.strTitle.c_str());
+                    idAlbum, crc, song.strTitle.c_str());
       
       if (!m_pDS->query(strSQL.c_str()))
         return;
       
       if (m_pDS->num_rows() != 0)
       {
-        lSongId = m_pDS->fv("idSong").get_asInt();
+        idSong = m_pDS->fv("idSong").get_asInt();
         bInsert = false;
       }
       m_pDS->close();
@@ -273,7 +273,7 @@
       CStdString strSQL1;
 
       strSQL=FormatSQL("insert into song (idSong,idAlbum,idPath,idArtist,strExtraArtists,idGenre,strExtraGenres,strTitle,iTrack,iDuration,iYear,dwFileNameCRC,strFileName,strMusicBrainzTrackID,strMusicBrainzArtistID,strMusicBrainzAlbumID,strMusicBrainzAlbumArtistID,strMusicBrainzTRMID,iTimesPlayed,iStartOffset,iEndOffset,idThumb,lastplayed,rating,comment) values (NULL,%i,%i,%i,'%s',%i,'%s','%s',%i,%i,%i,'%ul','%s','%s','%s','%s','%s','%s'",
-                    lAlbumId, lPathId, lArtistId, extraArtists.c_str(), lGenreId, extraGenres.c_str(),
+                    idAlbum, idPath, idArtist, extraArtists.c_str(), idGenre, extraGenres.c_str(),
                     song.strTitle.c_str(),
                     song.iTrack, song.iDuration, song.iYear,
                     crc, strFileName.c_str(),
@@ -285,30 +285,30 @@
 
       if (song.lastPlayed.GetLength())
         strSQL1=FormatSQL(",%i,%i,%i,%i,'%s','%c','%s')",
-                      song.iTimesPlayed, song.iStartOffset, song.iEndOffset, lThumbId, song.lastPlayed.c_str(), song.rating, song.strComment.c_str());
+                      song.iTimesPlayed, song.iStartOffset, song.iEndOffset, idThumb, song.lastPlayed.c_str(), song.rating, song.strComment.c_str());
       else
         strSQL1=FormatSQL(",%i,%i,%i,%i,NULL,'%c','%s')",
-                      song.iTimesPlayed, song.iStartOffset, song.iEndOffset, lThumbId, song.rating, song.strComment.c_str());
+                      song.iTimesPlayed, song.iStartOffset, song.iEndOffset, idThumb, song.rating, song.strComment.c_str());
       strSQL+=strSQL1;
 
       m_pDS->exec(strSQL.c_str());
-      lSongId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+      idSong = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
     }
 
     // add extra artists and genres
-    AddExtraSongArtists(vecArtists, lSongId, bCheck);
-    if (lAlbumArtistId > -1)
-      AddExtraAlbumArtists(vecAlbumArtists, lAlbumId);
+    AddExtraSongArtists(vecArtists, idSong, bCheck);
+    if (idAlbumArtist > -1)
+      AddExtraAlbumArtists(vecAlbumArtists, idAlbum);
     else
-      AddExtraAlbumArtists(vecArtists, lAlbumId);
-    AddExtraGenres(vecGenres, lSongId, lAlbumId, bCheck);
+      AddExtraAlbumArtists(vecArtists, idAlbum);
+    AddExtraGenres(vecGenres, idSong, idAlbum, bCheck);
 
     // Add karaoke information (if any)
     if ( bHasKaraoke )
     {
       // song argument is const :(
       CSong mysong = song;
-      mysong.idSong = lSongId;
+      mysong.idSong = idSong;
       AddKaraokeData( mysong );
     }
   }
@@ -318,7 +318,7 @@
   }
 }
 
-int CMusicDatabase::AddAlbum(const CStdString& strAlbum1, int lArtistId, const CStdString &extraArtists, const CStdString &strArtist, int idThumb, int idGenre, const CStdString &extraGenres, int year)
+int CMusicDatabase::AddAlbum(const CStdString& strAlbum1, int idArtist, const CStdString &extraArtists, const CStdString &strArtist, int idThumb, int idGenre, const CStdString &extraGenres, int year)
 {
   CStdString strSQL;
   try
@@ -343,20 +343,20 @@
     if (it != m_albumCache.end())
       return it->second.idAlbum;
 
-    strSQL=FormatSQL("select * from album where idArtist=%i and strAlbum like '%s'", lArtistId, strAlbum.c_str());
+    strSQL=FormatSQL("select * from album where idArtist=%i and strAlbum like '%s'", idArtist, strAlbum.c_str());
     m_pDS->query(strSQL.c_str());
 
     if (m_pDS->num_rows() == 0)
     {
       m_pDS->close();
       // doesnt exists, add it
-      strSQL=FormatSQL("insert into album (idAlbum, strAlbum, idArtist, strExtraArtists, idGenre, strExtraGenres, iYear, idThumb) values( NULL, '%s', %i, '%s', %i, '%s', %i, %i)", strAlbum.c_str(), lArtistId, extraArtists.c_str(), idGenre, extraGenres.c_str(), year, idThumb);
+      strSQL=FormatSQL("insert into album (idAlbum, strAlbum, idArtist, strExtraArtists, idGenre, strExtraGenres, iYear, idThumb) values( NULL, '%s', %i, '%s', %i, '%s', %i, %i)", strAlbum.c_str(), idArtist, extraArtists.c_str(), idGenre, extraGenres.c_str(), year, idThumb);
       m_pDS->exec(strSQL.c_str());
 
       CAlbumCache album;
       album.idAlbum = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
       album.strAlbum = strAlbum;
-      album.idArtist = lArtistId;
+      album.idArtist = idArtist;
       album.strArtist = strArtist;
       m_albumCache.insert(pair<CStdString, CAlbumCache>(album.strAlbum + album.strArtist, album));
       return album.idAlbum;
@@ -368,7 +368,7 @@
       CAlbumCache album;
       album.idAlbum = m_pDS->fv("idAlbum").get_asInt();
       album.strAlbum = strAlbum;
-      album.idArtist = lArtistId;
+      album.idArtist = idArtist;
       album.strArtist = strArtist;
       m_albumCache.insert(pair<CStdString, CAlbumCache>(album.strAlbum + album.strArtist, album));
       m_pDS->close();
@@ -490,15 +490,15 @@
   return -1;
 }
 
-void CMusicDatabase::AddExtraSongArtists(const CStdStringArray &vecArtists, int lSongId, bool bCheck)
+void CMusicDatabase::AddExtraSongArtists(const CStdStringArray &vecArtists, int idSong, bool bCheck)
 {
   try
   {
     // add each of the artists in the vector of artists
     for (int i = 1; i < (int)vecArtists.size(); i++)
     {
-      int lArtistId = AddArtist(vecArtists[i]);
-      if (lArtistId >= 0)
+      int idArtist = AddArtist(vecArtists[i]);
+      if (idArtist >= 0)
       { // added successfully, we must now add entries to the exartistsong table
         CStdString strSQL;
         // first link the artist with the song
@@ -506,7 +506,7 @@
         if (bCheck)
         {
           strSQL=FormatSQL("select * from exartistsong where idSong=%i and idArtist=%i",
-                        lSongId, lArtistId);
+                        idSong, idArtist);
           if (!m_pDS->query(strSQL.c_str())) return ;
           if (m_pDS->num_rows() != 0)
             bInsert = false; // already exists
@@ -515,7 +515,7 @@
         if (bInsert)
         {
           strSQL=FormatSQL("insert into exartistsong (idSong,iPosition,idArtist) values(%i,%i,%i)",
-                        lSongId, i, lArtistId);
+                        idSong, i, idArtist);
 
           m_pDS->exec(strSQL.c_str());
         }
@@ -524,25 +524,25 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%lu) failed", __FUNCTION__, lSongId);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idSong);
   }
 }
 
-void CMusicDatabase::AddExtraAlbumArtists(const CStdStringArray &vecArtists, int lAlbumId)
+void CMusicDatabase::AddExtraAlbumArtists(const CStdStringArray &vecArtists, int idAlbum)
 {
   try
   {
     // add each of the artists in the vector of artists
     for (int i = 1; i < (int)vecArtists.size(); i++)
     {
-      int lArtistId = AddArtist(vecArtists[i]);
-      if (lArtistId >= 0)
+      int idArtist = AddArtist(vecArtists[i]);
+      if (idArtist >= 0)
       { // added successfully, we must now add entries to the exartistalbum table
         CStdString strSQL;
         bool bInsert = true;
         // always check artists (as this routine is called whenever a song is added)
         strSQL=FormatSQL("select * from exartistalbum where idAlbum=%i and idArtist=%i",
-                      lAlbumId, lArtistId);
+                      idAlbum, idArtist);
         if (!m_pDS->query(strSQL.c_str())) return ;
         if (m_pDS->num_rows() != 0)
           bInsert = false; // already exists
@@ -550,7 +550,7 @@
         if (bInsert)
         {
           strSQL=FormatSQL("insert into exartistalbum (idAlbum,iPosition,idArtist) values(%i,%i,%i)",
-                        lAlbumId, i, lArtistId);
+                        idAlbum, i, idArtist);
 
           m_pDS->exec(strSQL.c_str());
         }
@@ -559,29 +559,29 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%lu) failed", __FUNCTION__, lAlbumId);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idAlbum);
   }
 }
 
-void CMusicDatabase::AddExtraGenres(const CStdStringArray &vecGenres, int lSongId, int lAlbumId, bool bCheck)
+void CMusicDatabase::AddExtraGenres(const CStdStringArray &vecGenres, int idSong, int idAlbum, bool bCheck)
 {
   try
   {
     // add each of the genres in the vector
     for (int i = 1; i < (int)vecGenres.size(); i++)
     {
-      int lGenreId = AddGenre(vecGenres[i]);
-      if (lGenreId >= 0)
+      int idGenre = AddGenre(vecGenres[i]);
+      if (idGenre >= 0)
       { // added successfully!
         CStdString strSQL;
         // first link the genre with the song
         bool bInsert = true;
-        if (lSongId)
+        if (idSong)
         {
           if (bCheck)
           {
             strSQL=FormatSQL("select * from exgenresong where idSong=%i and idGenre=%i",
-                          lSongId, lGenreId);
+                          idSong, idGenre);
             if (!m_pDS->query(strSQL.c_str())) return ;
             if (m_pDS->num_rows() != 0)
               bInsert = false; // already exists
@@ -590,23 +590,23 @@
           if (bInsert)
           {
             strSQL=FormatSQL("insert into exgenresong (idSong,iPosition,idGenre) values(%i,%i,%i)",
-                          lSongId, i, lGenreId);
+                          idSong, i, idGenre);
 
             m_pDS->exec(strSQL.c_str());
           }
         }
         // now link the genre with the album - we always check these as there's usually
         // more than one song per album with the same extra genres
-        if (lAlbumId)
+        if (idAlbum)
         {
           strSQL=FormatSQL("select * from exgenrealbum where idAlbum=%i and idGenre=%i",
-                        lAlbumId, lGenreId);
+                        idAlbum, idGenre);
           if (!m_pDS->query(strSQL.c_str())) return ;
           if (m_pDS->num_rows() == 0)
           { // insert
             m_pDS->close();
             strSQL=FormatSQL("insert into exgenrealbum (idAlbum,iPosition,idGenre) values(%i,%i,%i)",
-                          lAlbumId, i, lGenreId);
+                          idAlbum, i, idGenre);
 
             m_pDS->exec(strSQL.c_str());
           }
@@ -616,7 +616,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%lu,%lu) failed", __FUNCTION__, lSongId, lAlbumId);
+    CLog::Log(LOGERROR, "%s(%i,%i) failed", __FUNCTION__, idSong, idAlbum);
   }
 }
 
@@ -925,7 +925,7 @@
     if (NULL == m_pDS.get()) return false;
 
     CStdString strSQL=FormatSQL("select * from songview "
-                                "where idSong=%ld"
+                                "where idSong=%i"
                                 , idSong);
 
     if (!m_pDS->query(strSQL.c_str())) return false;
@@ -941,7 +941,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%ld) failed", __FUNCTION__, idSong);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idSong);
   }
 
   return false;
@@ -955,17 +955,17 @@
     if (NULL == m_pDS.get()) return false;
 
     // Exclude "Various Artists"
-    int lVariousArtistId = AddArtist(g_localizeStrings.Get(340));
+    int idVariousArtist = AddArtist(g_localizeStrings.Get(340));
 
     CStdString strSQL;
     if (search.GetLength() >= MIN_FULL_SEARCH_LENGTH)
       strSQL=FormatSQL("select * from artist "
                                 "where (strArtist like '%s%%' or strArtist like '%% %s%%') and idArtist <> %i "
-                                , search.c_str(), search.c_str(), lVariousArtistId );
+                                , search.c_str(), search.c_str(), idVariousArtist );
     else
       strSQL=FormatSQL("select * from artist "
                                 "where strArtist like '%s%%' and idArtist <> %i "
-                                , search.c_str(), lVariousArtistId );
+                                , search.c_str(), idVariousArtist );
 
     if (!m_pDS->query(strSQL.c_str())) return false;
     if (m_pDS->num_rows() == 0)
@@ -1095,7 +1095,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%ld) failed", __FUNCTION__, idAlbum);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idAlbum);
   }
 
   return false;
@@ -1117,7 +1117,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%ld) failed", __FUNCTION__, idAlbum);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idAlbum);
   }
 
   return false;
@@ -1130,7 +1130,7 @@
     if (idAlbum == -1)
       return false; // not in the database
 
-    CStdString strSQL = FormatSQL("delete from albuminfo where idAlbum=%u",idAlbum);
+    CStdString strSQL = FormatSQL("delete from albuminfo where idAlbum=%i",idAlbum);
 
     if (!m_pDS2->exec(strSQL.c_str()))
       return false;
@@ -1139,7 +1139,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s - (%ld) failed", __FUNCTION__, idAlbum);
+    CLog::Log(LOGERROR, "%s - (%i) failed", __FUNCTION__, idAlbum);
   }
 
   return false;
@@ -1154,7 +1154,7 @@
 
     CStdString strSQL=FormatSQL("select * from artistinfo "
                                 "join artist on artist.idartist=artistinfo.idArtist "
-                                "where artistinfo.idArtist = %ld"
+                                "where artistinfo.idArtist = %i"
                                 , idArtist);
 
     if (!m_pDS2->query(strSQL.c_str())) return false;
@@ -1180,7 +1180,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s - (%ld) failed", __FUNCTION__, idArtist);
+    CLog::Log(LOGERROR, "%s - (%i) failed", __FUNCTION__, idArtist);
   }
 
   return false;
@@ -1193,7 +1193,7 @@
     if (idArtist == -1)
       return false; // not in the database
 
-    CStdString strSQL = FormatSQL("delete from artistinfo where idartist=%u",idArtist);
+    CStdString strSQL = FormatSQL("delete from artistinfo where idartist=%i",idArtist);
 
     if (!m_pDS2->exec(strSQL.c_str()))
       return false;
@@ -1202,7 +1202,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s - (%ld) failed", __FUNCTION__, idArtist);
+    CLog::Log(LOGERROR, "%s - (%i) failed", __FUNCTION__, idArtist);
   }
 
   return false;
@@ -1236,7 +1236,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%lu) failed", __FUNCTION__, idAlbumInfo);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idAlbumInfo);
   }
 
   return false;
@@ -1523,9 +1523,9 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    int songID = GetSongIDFromPath(strFileName);
+    int idSong = GetSongIDFromPath(strFileName);
 
-    CStdString sql=FormatSQL("UPDATE song SET iTimesPlayed=iTimesPlayed+1, lastplayed=CURRENT_TIMESTAMP where idSong=%ld", songID);
+    CStdString sql=FormatSQL("UPDATE song SET iTimesPlayed=iTimesPlayed+1, lastplayed=CURRENT_TIMESTAMP where idSong=%i", idSong);
     m_pDS->exec(sql.c_str());
     return true;
   }
@@ -1589,17 +1589,17 @@
   DWORD time = timeGetTime();
   // first grab all the artists that match
   SearchArtists(search, items);
-  CLog::Log(LOGDEBUG, "%s Artist search in %u ms",
+  CLog::Log(LOGDEBUG, "%s Artist search in %i ms",
             __FUNCTION__, timeGetTime() - time); time = timeGetTime();
 
   // then albums that match
   SearchAlbums(search, items);
-  CLog::Log(LOGDEBUG, "%s Album search in %u ms",
+  CLog::Log(LOGDEBUG, "%s Album search in %i ms",
             __FUNCTION__, timeGetTime() - time); time = timeGetTime();
 
   // and finally songs
   SearchSongs(search, items);
-  CLog::Log(LOGDEBUG, "%s Songs search in %u ms",
+  CLog::Log(LOGDEBUG, "%s Songs search in %i ms",
             __FUNCTION__, timeGetTime() - time); time = timeGetTime();
   return true;
 }
@@ -1694,7 +1694,7 @@
     // and also the multiple genre string into single genres.
     CStdStringArray vecGenres; CStdString extraGenres;
     SplitString(album.strGenre, vecGenres, extraGenres);
-    int lGenreId = AddGenre(vecGenres[0]);
+    int idGenre = AddGenre(vecGenres[0]);
 
     // delete any album info we may have
     strSQL=FormatSQL("delete from albuminfo where idAlbum=%i", idAlbum);
@@ -1702,7 +1702,7 @@
 
     // insert the albuminfo
     strSQL=FormatSQL("insert into albuminfo (idAlbumInfo,idAlbum,idGenre,strExtraGenres,strMoods,strStyles,strThemes,strReview,strImage,strLabel,strType,iRating,iYear) values(NULL,%i,%i,'%s','%s','%s','%s','%s','%s','%s','%s',%i,%i)",
-                  idAlbum, lGenreId, extraGenres.c_str(),
+                  idAlbum, idGenre, extraGenres.c_str(),
                   album.strMoods.c_str(),
                   album.strStyles.c_str(),
                   album.strThemes.c_str(),
@@ -2056,13 +2056,13 @@
     // must be executed AFTER the song, exartistsong, album and exartistalbum tables are cleaned.
     // don't delete the "Various Artists" string
     CStdString strVariousArtists = g_localizeStrings.Get(340);
-    int lVariousArtistsId = AddArtist(strVariousArtists);
+    int idVariousArtists = AddArtist(strVariousArtists);
     CStdString strSQL = "delete from artist where idArtist not in (select idArtist from song)";
     strSQL += " and idArtist not in (select idArtist from exartistsong)";
     strSQL += " and idArtist not in (select idArtist from album)";
     strSQL += " and idArtist not in (select idArtist from exartistalbum)";
     CStdString strSQL2;
-    strSQL2.Format(" and idArtist<>%i", lVariousArtistsId);
+    strSQL2.Format(" and idArtist<>%i", idVariousArtists);
     strSQL += strSQL2;
     m_pDS->exec(strSQL.c_str());
     return true;
@@ -2635,52 +2635,52 @@
       if (!albumArtistsOnly)  // show all artists in this case (ie those linked to a song)
         strSQL+=FormatSQL("("
                           "select song.idArtist from song " // All primary artists linked to primary genres
-                          "where song.idGenre=%ld"
+                          "where song.idGenre=%i"
                           ") "
                         "or idArtist IN "
                           "("
                           "select song.idArtist from song " // All primary artists linked to extra genres
                             "join exgenresong on song.idSong=exgenresong.idSong "
-                          "where exgenresong.idGenre=%ld"
+                          "where exgenresong.idGenre=%i"
                           ")"
                         "or idArtist IN "
                           "("
                           "select exartistsong.idArtist from exartistsong " // All extra artists linked to extra genres
                             "join song on exartistsong.idSong=song.idSong "
                             "join exgenresong on song.idSong=exgenresong.idSong "
-                          "where exgenresong.idGenre=%ld"
+                          "where exgenresong.idGenre=%i"
                           ") "
                         "or idArtist IN "
                           "("
                           "select exartistsong.idArtist from exartistsong " // All extra artists linked to primary genres
                             "join song on exartistsong.idSong=song.idSong "
-                          "where song.idGenre=%ld"
+                          "where song.idGenre=%i"
                           ") "
                         "or idArtist IN "
                         , idGenre, idGenre, idGenre, idGenre);
       // and add any artists linked to an album (may be different from above due to album artist tag)
       strSQL += FormatSQL("("
                           "select album.idArtist from album " // All primary album artists linked to primary genres
-                          "where album.idGenre=%ld"
+                          "where album.idGenre=%i"
                           ") "
                         "or idArtist IN "
                           "("
                           "select album.idArtist from album " // All primary album artists linked to extra genres
                             "join exgenrealbum on album.idAlbum=exgenrealbum.idAlbum "
-                          "where exgenrealbum.idGenre=%ld"
+                          "where exgenrealbum.idGenre=%i"
                           ")"
                         "or idArtist IN "
                           "("
                           "select exartistalbum.idArtist from exartistalbum " // All extra album artists linked to extra genres
                             "join album on exartistalbum.idAlbum=album.idAlbum "
                             "join exgenrealbum on album.idAlbum=exgenrealbum.idAlbum "
-                          "where exgenrealbum.idGenre=%ld"
+                          "where exgenrealbum.idGenre=%i"
                           ") "
                         "or idArtist IN "
                           "("
                           "select exartistalbum.idArtist from exartistalbum " // All extra album artists linked to primary genres
                             "join album on exartistalbum.idAlbum=album.idAlbum "
-                          "where album.idGenre=%ld"
+                          "where album.idGenre=%i"
                           ") "
                         ")", idGenre, idGenre, idGenre, idGenre);
     }
@@ -2691,8 +2691,8 @@
     if (!albumArtistsOnly)
     {
       CStdString strVariousArtists = g_localizeStrings.Get(340);
-      int lVariousArtistsId = AddArtist(strVariousArtists);
-      strSQL+=FormatSQL(" and artist.idArtist<>%i", lVariousArtistsId);
+      int idVariousArtists = AddArtist(strVariousArtists);
+      strSQL+=FormatSQL(" and artist.idArtist<>%i", idVariousArtists);
     }
 
     // run query
@@ -2737,7 +2737,7 @@
 
       m_pDS->next();
     }
-    CLog::Log(LOGDEBUG,"Time to retrieve artists from dataset = %u", timeGetTime() - time);
+    CLog::Log(LOGDEBUG,"Time to retrieve artists from dataset = %i", timeGetTime() - time);
 
     // cleanup
     m_pDS->close();
@@ -2759,7 +2759,7 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString strSQL = FormatSQL("select albumview.* from song join albumview on song.idAlbum = albumview.idAlbum where song.idSong='%ld'", idSong);
+    CStdString strSQL = FormatSQL("select albumview.* from song join albumview on song.idAlbum = albumview.idAlbum where song.idSong='%i'", idSong);
     if (!m_pDS->query(strSQL.c_str())) return false;
     int iRowsFound = m_pDS->num_rows();
     if (iRowsFound != 1)
@@ -2824,13 +2824,13 @@
     strWhere+=FormatSQL("where (idAlbum IN "
                           "("
                           "select song.idAlbum from song " // All albums where the primary genre fits
-                          "where song.idGenre=%ld"
+                          "where song.idGenre=%i"
                           ") "
                         "or idAlbum IN "
                           "("
                           "select song.idAlbum from song " // All albums where extra genres fits
                             "join exgenresong on song.idSong=exgenresong.idSong "
-                          "where exgenresong.idGenre=%ld"
+                          "where exgenresong.idGenre=%i"
                           ")"
                         ") "
                         , idGenre, idGenre);
@@ -2846,23 +2846,23 @@
     strWhere +=FormatSQL("(idAlbum IN "
                             "("
                               "select song.idAlbum from song "  // All albums where the primary artist fits
-                              "where song.idArtist=%ld"
+                              "where song.idArtist=%i"
                             ")"
                           " or idAlbum IN "
                             "("
                               "select song.idAlbum from song "  // All albums where extra artists fit
                                 "join exartistsong on song.idSong=exartistsong.idSong "
-                              "where exartistsong.idArtist=%ld"
+                              "where exartistsong.idArtist=%i"
                             ")"
                           " or idAlbum IN "
                             "("
                               "select album.idAlbum from album " // All albums where primary album artist fits
-                              "where album.idArtist=%ld"
+                              "where album.idArtist=%i"
                             ")"
                           " or idAlbum IN "
                             "("
                               "select exartistalbum.idAlbum from exartistalbum " // All albums where extra album artists fit
-                              "where exartistalbum.idArtist=%ld"
+                              "where exartistalbum.idArtist=%i"
                             ")"
                           ") "
                           , idArtist, idArtist, idArtist, idArtist);
@@ -3017,11 +3017,11 @@
     else
       strWhere += "and ";
 
-    strWhere += FormatSQL("(idGenre=%ld " // All songs where primary genre fits
+    strWhere += FormatSQL("(idGenre=%i " // All songs where primary genre fits
                           "or idSong IN "
                             "("
                             "select exgenresong.idSong from exgenresong " // All songs by where extra genres fit
-                            "where exgenresong.idGenre=%ld"
+                            "where exgenresong.idGenre=%i"
                             ")"
                           ") "
                           , idGenre, idGenre);
@@ -3034,24 +3034,24 @@
     else
       strWhere += "and ";
 
-    strWhere += FormatSQL("(idArtist=%ld " // All songs where primary artist fits
+    strWhere += FormatSQL("(idArtist=%i " // All songs where primary artist fits
                           "or idSong IN "
                             "("
                             "select exartistsong.idSong from exartistsong " // All songs where extra artists fit
-                            "where exartistsong.idArtist=%ld"
+                            "where exartistsong.idArtist=%i"
                             ")"
                           "or idSong IN "
                             "("
                             "select song.idSong from song " // All songs where the primary album artist fits
                             "join album on song.idAlbum=album.idAlbum "
-                            "where album.idArtist=%ld"
+                            "where album.idArtist=%i"
                             ")"
                           "or idSong IN "
                             "("
                             "select song.idSong from song " // All songs where the extra album artist fit, excluding
                             "join exartistalbum on song.idAlbum=exartistalbum.idAlbum " // various artist albums
                             "join album on song.idAlbum=album.idAlbum "
-                            "where exartistalbum.idArtist=%ld and album.strExtraArtists != ''"
+                            "where exartistalbum.idArtist=%i and album.strExtraArtists != ''"
                             ")"
                           ") "
                           , idArtist, idArtist, idArtist, idArtist);
@@ -3204,7 +3204,7 @@
             str << *thumb;
             thumb = thumb->NextSiblingElement("thumb");
           }
-          CStdString strSQL = FormatSQL("update %s set strImage='%s' where %s=%u",
+          CStdString strSQL = FormatSQL("update %s set strImage='%s' where %s=%i",
                                         tag2[i],
                                         str.str().c_str(),tag1[i],
                                         m_pDS->fv(0).get_asInt());
@@ -3354,7 +3354,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%ld) failed", __FUNCTION__, idAlbum);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idAlbum);
   }
 
   return false;
@@ -3384,7 +3384,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%ld) failed", __FUNCTION__, idAlbum);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idAlbum);
   }
 
   return false;
@@ -3397,7 +3397,7 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString strSQL=FormatSQL("select strThumb from thumb join album on album.idThumb = thumb.idThumb where album.idAlbum=%u", idAlbum);
+    CStdString strSQL=FormatSQL("select strThumb from thumb join album on album.idThumb = thumb.idThumb where album.idAlbum=%i", idAlbum);
     m_pDS2->query(strSQL.c_str());
     if (m_pDS2->eof())
       return false;
@@ -3408,7 +3408,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s - (%ld) failed", __FUNCTION__, idAlbum);
+    CLog::Log(LOGERROR, "%s - (%i) failed", __FUNCTION__, idAlbum);
   }
 
   return false;
@@ -3423,8 +3423,8 @@
 
     // find all albums from this artist, and all the paths to the songs from those albums
     CStdString strSQL=FormatSQL("select strPath from album join song on album.idAlbum = song.idAlbum join path on song.idPath = path.idPath "
-                                "where album.idAlbum in (select idAlbum from album where album.idArtist=%ld) "
-                                "or album.idAlbum in (select idAlbum from exartistalbum where exartistalbum.idArtist = %ld) "
+                                "where album.idAlbum in (select idAlbum from album where album.idArtist=%i) "
+                                "or album.idAlbum in (select idAlbum from exartistalbum where exartistalbum.idArtist = %i) "
                                 "group by song.idPath", idArtist, idArtist);
 
     // run query
@@ -3534,7 +3534,7 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString strSQL=FormatSQL("select strGenre from genre where genre.idGenre = %ld", idGenre);
+    CStdString strSQL=FormatSQL("select strGenre from genre where genre.idGenre = %i", idGenre);
 
     // run query
     if (!m_pDS->query(strSQL.c_str())) return false;
@@ -3588,7 +3588,7 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString strSQL=FormatSQL("select strArtist from artist where artist.idArtist = %ld", idArtist);
+    CStdString strSQL=FormatSQL("select strArtist from artist where artist.idArtist = %i", idArtist);
 
     // run query
     if (!m_pDS->query(strSQL.c_str())) return false;
@@ -3636,11 +3636,11 @@
   return false;
 }
 
-bool CMusicDatabase::GetRandomSong(CFileItem* item, int& lSongId, const CStdString& strWhere)
+bool CMusicDatabase::GetRandomSong(CFileItem* item, int& idSong, const CStdString& strWhere)
 {
   try
   {
-    lSongId = -1;
+    idSong = -1;
 
     int iCount = GetSongsCount(strWhere);
     if (iCount <= 0)
@@ -3665,7 +3665,7 @@
       return false;
     }
     GetFileItemFromDataset(item, "");
-    lSongId = m_pDS->fv("songview.idSong").get_asInt();
+    idSong = m_pDS->fv("songview.idSong").get_asInt();
     m_pDS->close();
     return true;
   }
@@ -3688,7 +3688,7 @@
     if (idVariousArtists<0)
       return false;
 
-    CStdString strSQL = FormatSQL("select * from albumview where idArtist=%ld", idVariousArtists);
+    CStdString strSQL = FormatSQL("select * from albumview where idArtist=%i", idVariousArtists);
 
     // run query
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
@@ -3737,7 +3737,7 @@
     if (idVariousArtists<0)
       return false;
 
-    CStdString strSQL = FormatSQL("select * from songview where idAlbum IN (select idAlbum from album where idArtist=%ld)", idVariousArtists);
+    CStdString strSQL = FormatSQL("select * from songview where idAlbum IN (select idAlbum from album where idArtist=%i)", idVariousArtists);
 
     // run query
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
@@ -3793,10 +3793,10 @@
       if (!CDirectory::Exists(path))
         return false;
     }
-    int pathId = AddPath(path);
-    if (pathId < 0) return false;
+    int idPath = AddPath(path);
+    if (idPath < 0) return false;
 
-    CStdString strSQL=FormatSQL("update path set strHash='%s' where idPath=%ld", hash.c_str(), pathId);
+    CStdString strSQL=FormatSQL("update path set strHash='%s' where idPath=%ld", hash.c_str(), idPath);
     m_pDS->exec(strSQL.c_str());
 
     return true;
@@ -4049,17 +4049,17 @@
       CDirectoryNode::GetDatabaseInfo(strPath, params);
       if (params.GetGenreId() != -1) // check genre
       {
-        strSQL = FormatSQL("select * from content where strPath like 'musicdb://1/%u/'",params.GetGenreId());
+        strSQL = FormatSQL("select * from content where strPath like 'musicdb://1/%i/'",params.GetGenreId());
         m_pDS->query(strSQL.c_str());
       }
       if (m_pDS->eof() && params.GetAlbumId() != -1) // check album
       {
-        strSQL = FormatSQL("select * from content where strPath like 'musicdb://3/%u/'",params.GetGenreId());
+        strSQL = FormatSQL("select * from content where strPath like 'musicdb://3/%i/'",params.GetGenreId());
         m_pDS->query(strSQL.c_str());
       }
       if (m_pDS->eof() && params.GetArtistId() != -1) // check artist
       {
-        strSQL = FormatSQL("select * from content where strPath like 'musicdb://2/%u/'",params.GetArtistId());
+        strSQL = FormatSQL("select * from content where strPath like 'musicdb://2/%i/'",params.GetArtistId());
         m_pDS->query(strSQL.c_str());
       }
       if (m_pDS->eof()) // general albums setting
@@ -4411,7 +4411,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s(%ld) failed", __FUNCTION__, number);
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, number);
   }
 
   return false;

Modified: trunk/xbmc/MusicDatabase.h
===================================================================
--- trunk/xbmc/MusicDatabase.h	2009-09-30 22:31:16 UTC (rev 23278)
+++ trunk/xbmc/MusicDatabase.h	2009-09-30 22:34:22 UTC (rev 23279)
@@ -164,7 +164,7 @@
   bool GetSongsByYear(const CStdString& baseDir, CFileItemList& items, int year);
   bool GetSongsByWhere(const CStdString &baseDir, const CStdString &whereClause, CFileItemList& items);
   bool GetAlbumsByWhere(const CStdString &baseDir, const CStdString &where, const CStdString &order, CFileItemList &items);
-  bool GetRandomSong(CFileItem* item, int& lSongId, const CStdString& strWhere);
+  bool GetRandomSong(CFileItem* item, int& idSong, const CStdString& strWhere);
   int GetKaraokeSongsCount();
   int GetSongsCount(const CStdString& strWhere = "");
   unsigned int GetSongIDs(const CStdString& strWhere, std::vector<std::pair<int,int> > &songIDs);
@@ -203,15 +203,15 @@
   std::map<CStdString, int /*CPathCache*/> m_thumbCache;
   std::map<CStdString, CAlbumCache> m_albumCache;
   virtual bool CreateTables();
-  int AddAlbum(const CStdString& strAlbum1, int lArtistId, const CStdString &extraArtists, const CStdString &strArtist1, int idThumb, int idGenre, const CStdString &extraGenres, int year);
+  int AddAlbum(const CStdString& strAlbum1, int idArtist, const CStdString &extraArtists, const CStdString &strArtist1, int idThumb, int idGenre, const CStdString &extraGenres, int year);
   int AddGenre(const CStdString& strGenre);
   int AddArtist(const CStdString& strArtist);
   int AddPath(const CStdString& strPath);
   int AddThumb(const CStdString& strThumb1);
-  void AddExtraAlbumArtists(const CStdStringArray& vecArtists, int lAlbumId);
-  void AddExtraSongArtists(const CStdStringArray& vecArtists, int lSongId, bool bCheck = true);
+  void AddExtraAlbumArtists(const CStdStringArray& vecArtists, int idAlbum);
+  void AddExtraSongArtists(const CStdStringArray& vecArtists, int idSong, bool bCheck = true);
   void AddKaraokeData(const CSong& song);
-  void AddExtraGenres(const CStdStringArray& vecGenres, int lSongId, int lAlbumId, bool bCheck = true);
+  void AddExtraGenres(const CStdStringArray& vecGenres, int idSong, int idAlbum, bool bCheck = true);
   bool SetAlbumInfoSongs(int idAlbumInfo, const VECSONGS& songs);
   bool GetAlbumInfoSongs(int idAlbumInfo, VECSONGS& songs);
 private:

Modified: trunk/xbmc/VideoDatabase.cpp
===================================================================
--- trunk/xbmc/VideoDatabase.cpp	2009-09-30 22:31:16 UTC (rev 23278)
+++ trunk/xbmc/VideoDatabase.cpp	2009-09-30 22:34:22 UTC (rev 23279)
@@ -329,7 +329,7 @@
   CStdString strSQL;
   try
   {
-    int lPathId=-1;
+    int idPath=-1;
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
 
@@ -342,10 +342,10 @@
     strSQL=FormatSQL("select idPath from path where strPath like '%s'",strPath1.c_str());
     m_pDS->query(strSQL.c_str());
     if (!m_pDS->eof())
-      lPathId = m_pDS->fv("path.idPath").get_asInt();
+      idPath = m_pDS->fv("path.idPath").get_asInt();
 
     m_pDS->close();
-    return lPathId;
+    return idPath;
   }
   catch (...)
   {
@@ -468,7 +468,7 @@
   {
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
-    strSQL = FormatSQL("select distinct path.idPath from path,tvshowlinkepisode join episode on tvshowlinkepisode.idEpisode=episode.idEpisode join files on files.idPath=path.idPath where episode.idFile = files.idFile and tvshowlinkepisode.idShow=%u",idShow);
+    strSQL = FormatSQL("select distinct path.idPath from path,tvshowlinkepisode join episode on tvshowlinkepisode.idEpisode=episode.idEpisode join files on files.idPath=path.idPath where episode.idFile = files.idFile and tvshowlinkepisode.idShow=%i",idShow);
     m_pDS->query(strSQL.c_str());
     while (!m_pDS->eof())
     {
@@ -490,7 +490,7 @@
   CStdString strSQL;
   try
   {
-    int lPathId;
+    int idPath;
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
 
@@ -502,8 +502,8 @@
 
     strSQL=FormatSQL("insert into path (idPath, strPath, strContent, strScraper) values (NULL,'%s','','')", strPath1.c_str());
     m_pDS->exec(strSQL.c_str());
-    lPathId = (int)sqlite3_last_insert_rowid( m_pDB->getHandle() );
-    return lPathId;
+    idPath = (int)sqlite3_last_insert_rowid( m_pDB->getHandle() );
+    return idPath;
   }
   catch (...)
   {
@@ -541,34 +541,34 @@
   CStdString strSQL = "";
   try
   {
-    int lFileId;
+    int idFile;
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
 
     CStdString strFileName, strPath;
     SplitPath(strFileNameAndPath,strPath,strFileName);
 
-    int lPathId=GetPathId(strPath);
-    if (lPathId < 0)
-      lPathId = AddPath(strPath);
+    int idPath=GetPathId(strPath);
+    if (idPath < 0)
+      idPath = AddPath(strPath);
 
-    if (lPathId < 0)
+    if (idPath < 0)
       return -1;
 
-    CStdString strSQL=FormatSQL("select idFile from files where strFileName like '%s' and idPath=%u", strFileName.c_str(),lPathId);
+    CStdString strSQL=FormatSQL("select idFile from files where strFileName like '%s' and idPath=%i", strFileName.c_str(),idPath);
 
     m_pDS->query(strSQL.c_str());
     if (m_pDS->num_rows() > 0)
     {
-      lFileId = m_pDS->fv("idFile").get_asInt() ;
+      idFile = m_pDS->fv("idFile").get_asInt() ;
       m_pDS->close();
-      return lFileId;
+      return idFile;
     }
     m_pDS->close();
-    strSQL=FormatSQL("insert into files (idFile,idPath,strFileName) values(NULL, %u, '%s')", lPathId,strFileName.c_str());
+    strSQL=FormatSQL("insert into files (idFile,idPath,strFileName) values(NULL, %i, '%s')", idPath,strFileName.c_str());
     m_pDS->exec(strSQL.c_str());
-    lFileId = (int)sqlite3_last_insert_rowid( m_pDB->getHandle() );
-    return lFileId;
+    idFile = (int)sqlite3_last_insert_rowid( m_pDB->getHandle() );
+    return idFile;
   }
   catch (...)
   {
@@ -590,12 +590,12 @@
       if (!CDirectory::Exists(path))
         return false;
     }
-    int pathId = GetPathId(path);
-    if (pathId < 0)
-      pathId = AddPath(path);
-    if (pathId < 0) return false;
+    int idPath = GetPathId(path);
+    if (idPath < 0)
+      idPath = AddPath(path);
+    if (idPath < 0) return false;
 
-    CStdString strSQL=FormatSQL("update path set strHash='%s' where idPath=%ld", hash.c_str(), pathId);
+    CStdString strSQL=FormatSQL("update path set strHash='%s' where idPath=%ld", hash.c_str(), idPath);
     m_pDS->exec(strSQL.c_str());
 
     return true;
@@ -617,19 +617,19 @@
 
     if (bRemove) // delete link
     {
-      CStdString strSQL=FormatSQL("delete from movielinktvshow where idMovie=%u and idShow=%u", idMovie, idShow);
+      CStdString strSQL=FormatSQL("delete from movielinktvshow where idMovie=%i and idShow=%i", idMovie, idShow);
       m_pDS->exec(strSQL.c_str());
       return true;
     }
 
-    CStdString strSQL=FormatSQL("insert into movielinktvshow (idShow,idMovie) values (%u,%u)", idShow,idMovie);
+    CStdString strSQL=FormatSQL("insert into movielinktvshow (idShow,idMovie) values (%i,%i)", idShow,idMovie);
     m_pDS->exec(strSQL.c_str());
 
     return true;
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s (%ld, %ld) failed", __FUNCTION__, idMovie, idShow);
+    CLog::Log(LOGERROR, "%s (%i, %i) failed", __FUNCTION__, idMovie, idShow);
   }
 
   return false;
@@ -642,7 +642,7 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString strSQL=FormatSQL("select * from movielinktvshow where idMovie=%u", idMovie);
+    CStdString strSQL=FormatSQL("select * from movielinktvshow where idMovie=%i", idMovie);
     m_pDS->query(strSQL.c_str());
     if (m_pDS->eof())
     {
@@ -655,7 +655,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s (%ld) failed", __FUNCTION__, idMovie);
+    CLog::Log(LOGERROR, "%s (%i) failed", __FUNCTION__, idMovie);
   }
 
   return false;
@@ -668,7 +668,7 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString strSQL=FormatSQL("select * from movielinktvshow where idMovie=%u", idMovie);
+    CStdString strSQL=FormatSQL("select * from movielinktvshow where idMovie=%i", idMovie);
     m_pDS->query(strSQL.c_str());
     while (!m_pDS->eof())
     {
@@ -681,7 +681,7 @@
   }
   catch (...)
   {
-    CLog::Log(LOGERROR, "%s (%ld) failed", __FUNCTION__, idMovie);
+    CLog::Log(LOGERROR, "%s (%i) failed", __FUNCTION__, idMovie);
   }
 
   return false;
@@ -698,18 +698,18 @@
     CStdString strPath, strFileName;
     SplitPath(strFilenameAndPath,strPath,strFileName);
 
-    int lPathId = GetPathId(strPath);
-    if (lPathId < 0)
+    int idPath = GetPathId(strPath);
+    if (idPath < 0)
       return -1;
 
     CStdString strSQL;
-    strSQL=FormatSQL("select idFile from files where strFileName like '%s' and idPath=%u", strFileName.c_str(),lPathId);
+    strSQL=FormatSQL("select idFile from files where strFileName like '%s' and idPath=%i", strFileName.c_str(),idPath);
     m_pDS->query(strSQL.c_str());
     if (m_pDS->num_rows() > 0)
     {
-      int lFileId = m_pDS->fv("files.idFile").get_asInt();
+      int idFile = m_pDS->fv("files.idFile").get_asInt();
       m_pDS->close();
-      return lFileId;
+      return idFile;
     }
   }
   catch (...)
@@ -726,38 +726,38 @@
   {
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
-    int lMovieId = -1;
+    int idMovie = -1;
 
     // needed for query parameters
-    int lFileId = GetFileId(strFilenameAndPath);
-    int lPathId=-1;
+    int idFile = GetFileId(strFilenameAndPath);
+    int idPath=-1;
     CStdString strPath, strFile;
-    if (lFileId < 0)
+    if (idFile < 0)
     {
       SplitPath(strFilenameAndPath,strPath,strFile);
 
       // have to join movieinfo table for correct results
-      lPathId = GetPathId(strPath);
-      if (lPathId < 0 && strPath != strFilenameAndPath)
+      idPath = GetPathId(strPath);
+      if (idPath < 0 && strPath != strFilenameAndPath)
         return -1;
     }
 
-    if (lFileId == -1 && strPath != strFilenameAndPath)
+    if (idFile == -1 && strPath != strFilenameAndPath)
       return -1;
 
     CStdString strSQL;
-    if (lFileId == -1)
-      strSQL=FormatSQL("select idMovie from movie join files on files.idFile=movie.idFile where files.idpath = %u",lPathId);
+    if (idFile == -1)
+      strSQL=FormatSQL("select idMovie from movie join files on files.idFile=movie.idFile where files.idpath = %i",idPath);
     else
-      strSQL=FormatSQL("select idMovie from movie where idFile=%u", lFileId);
+      strSQL=FormatSQL("select idMovie from movie where idFile=%i", idFile);
 
     CLog::Log(LOGDEBUG, "%s (%s), query = %s", __FUNCTION__, strFilenameAndPath.c_str(), strSQL.c_str());
     m_pDS->query(strSQL.c_str());
     if (m_pDS->num_rows() > 0)
-      lMovieId = m_pDS->fv("idMovie").get_asInt();
+      idMovie = m_pDS->fv("idMovie").get_asInt();
     m_pDS->close();
 
-    return lMovieId;
+    return idMovie;
   }
   catch (...)
   {
@@ -772,11 +772,11 @@
   {
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
-    int lTvShowId = -1;
+    int idTvShow = -1;
 
     // have to join movieinfo table for correct results
-    int lPathId = GetPathId(strPath);
-    if (lPathId < 0)
+    int idPath = GetPathId(strPath);
+    if (idPath < 0)
       return -1;
 
     CStdString strSQL;
@@ -784,7 +784,7 @@
     CStdString strParent;
     int iFound=0;
 
-    strSQL=FormatSQL("select idShow from tvshowlinkpath where tvshowlinkpath.idPath=%u",lPathId);
+    strSQL=FormatSQL("select idShow from tvshowlinkpath where tvshowlinkpath.idPath=%i",idPath);
     m_pDS->query(strSQL);
     if (!m_pDS->eof())
       iFound = 1;
@@ -803,10 +803,10 @@
     }
 
     if (m_pDS->num_rows() > 0)
-      lTvShowId = m_pDS->fv("idShow").get_asInt();
+      idTvShow = m_pDS->fv("idShow").get_asInt();
     m_pDS->close();
 
-    return lTvShowId;
+    return idTvShow;
   }
   catch (...)
   {
@@ -815,7 +815,7 @@
   return -1;
 }
 
-int CVideoDatabase::GetEpisodeId(const CStdString& strFilenameAndPath, int lEpisodeId, int lSeasonId) // input value is episode/season number hint - for multiparters
+int CVideoDatabase::GetEpisodeId(const CStdString& strFilenameAndPath, int idEpisode, int idSeason) // input value is episode/season number hint - for multiparters
 {
   try
   {
@@ -827,42 +827,42 @@
     pDS.reset(m_pDB->CreateDataset());
     if (NULL == pDS.get()) return -1;
 
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
       return -1;
 
-    CStdString strSQL=FormatSQL("select idEpisode from episode where idFile=%u", lFileId);
+    CStdString strSQL=FormatSQL("select idEpisode from episode where idFile=%i", idFile);
 
     CLog::Log(LOGDEBUG, "%s (%s), query = %s", __FUNCTION__, strFilenameAndPath.c_str(), strSQL.c_str());
     pDS->query(strSQL.c_str());
     if (pDS->num_rows() > 0)
     {
-      if (lEpisodeId == -1)
-        lEpisodeId = pDS->fv("episode.idEpisode").get_asInt();
+      if (idEpisode == -1)
+        idEpisode = pDS->fv("episode.idEpisode").get_asInt();
       else // use the hint!
       {
         while (!pDS->eof())
         {
           CVideoInfoTag tag;
-          int lTmpEpisodeId = pDS->fv("episode.idEpisode").get_asInt();
-          GetEpisodeInfo(strFilenameAndPath,tag,lTmpEpisodeId);
-          if (tag.m_iEpisode == lEpisodeId && (lSeasonId == -1 || tag.m_iSeason == lSeasonId)) {
+          int idTmpEpisode = pDS->fv("episode.idEpisode").get_asInt();
+          GetEpisodeInfo(strFilenameAndPath,tag,idTmpEpisode);
+          if (tag.m_iEpisode == idEpisode && (idSeason == -1 || tag.m_iSeason == idSeason)) {
             // match on the episode hint, and there's no season hint or a season hint match
-            lEpisodeId = lTmpEpisodeId;
+            idEpisode = idTmpEpisode;
             break;
           }
           pDS->next();
         }
         if (pDS->eof())
-          lEpisodeId = -1;
+          idEpisode = -1;
       }
     }
     else
-      lEpisodeId = -1;
+      idEpisode = -1;
 
     pDS->close();
 
-    return lEpisodeId;
+    return idEpisode;
   }
   catch (...)
   {
@@ -878,20 +878,20 @@
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
 
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
       return -1;
 
-    CStdString strSQL=FormatSQL("select idMVideo from musicvideo where idFile=%u", lFileId);
+    CStdString strSQL=FormatSQL("select idMVideo from musicvideo where idFile=%i", idFile);
 
     CLog::Log(LOGDEBUG, "%s (%s), query = %s", __FUNCTION__, strFilenameAndPath.c_str(), strSQL.c_str());
     m_pDS->query(strSQL.c_str());
-    int lMVideoId=-1;
+    int idMVideo=-1;
     if (m_pDS->num_rows() > 0)
-      lMVideoId = m_pDS->fv("idMVideo").get_asInt();
+      idMVideo = m_pDS->fv("idMVideo").get_asInt();
     m_pDS->close();
 
-    return lMVideoId;
+    return idMVideo;
   }
   catch (...)
   {
@@ -908,21 +908,21 @@
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
 
-    int lFileId, lMovieId=-1;
-    lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
-      lFileId = AddFile(strFilenameAndPath);
+    int idFile, idMovie=-1;
+    idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
+      idFile = AddFile(strFilenameAndPath);
     else
-      lMovieId = GetMovieId(strFilenameAndPath);
-    if (lMovieId < 0)
+      idMovie = GetMovieId(strFilenameAndPath);
+    if (idMovie < 0)
     {
-      CStdString strSQL=FormatSQL("insert into movie (idMovie, idFile) values (NULL, %u)", lFileId);
+      CStdString strSQL=FormatSQL("insert into movie (idMovie, idFile) values (NULL, %i)", idFile);
       m_pDS->exec(strSQL.c_str());
-      lMovieId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+      idMovie = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
 //      CommitTransaction();
     }
 
-    return lMovieId;
+    return idMovie;
   }
   catch (...)
   {
@@ -945,17 +945,17 @@
 
     strSQL=FormatSQL("insert into tvshow (idShow) values (NULL)");
     m_pDS->exec(strSQL.c_str());
-    int lTvShow = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+    int idTvShow = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
 
-    int lPathId = GetPathId(strPath);
-    if (lPathId < 0)
-      lPathId = AddPath(strPath);
-    strSQL=FormatSQL("insert into tvshowlinkpath values (%u,%u)",lTvShow,lPathId);
+    int idPath = GetPathId(strPath);
+    if (idPath < 0)
+      idPath = AddPath(strPath);
+    strSQL=FormatSQL("insert into tvshowlinkpath values (%i,%i)",idTvShow,idPath);
     m_pDS->exec(strSQL.c_str());
 
 //    CommitTransaction();
 
-    return lTvShow;
+    return idTvShow;
   }
   catch (...)
   {
@@ -972,20 +972,20 @@
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
 
-    int lFileId, lEpisodeId=-1;
-    lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
-      lFileId = AddFile(strFilenameAndPath);
+    int idFile, idEpisode=-1;
+    idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
+      idFile = AddFile(strFilenameAndPath);
 
-    CStdString strSQL=FormatSQL("insert into episode (idEpisode, idFile) values (NULL, %u)", lFileId);
+    CStdString strSQL=FormatSQL("insert into episode (idEpisode, idFile) values (NULL, %i)", idFile);
     m_pDS->exec(strSQL.c_str());
-    lEpisodeId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+    idEpisode = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
 
-    strSQL=FormatSQL("insert into tvshowlinkepisode (idShow,idEpisode) values (%i,%i)",idShow,lEpisodeId);
+    strSQL=FormatSQL("insert into tvshowlinkepisode (idShow,idEpisode) values (%i,%i)",idShow,idEpisode);
     m_pDS->exec(strSQL.c_str());
 //    CommitTransaction();
 
-    return lEpisodeId;
+    return idEpisode;
   }
   catch (...)
   {
@@ -1001,20 +1001,20 @@
     if (NULL == m_pDB.get()) return -1;
     if (NULL == m_pDS.get()) return -1;
 
-    int lFileId, lMVideoId=-11;
-    lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
-      lFileId = AddFile(strFilenameAndPath);
+    int idFile, idMVideo=-11;
+    idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
+      idFile = AddFile(strFilenameAndPath);
     else
-      lMVideoId = GetMusicVideoId(strFilenameAndPath);
-    if (lMVideoId < 0)
+      idMVideo = GetMusicVideoId(strFilenameAndPath);
+    if (idMVideo < 0)
     {
-      CStdString strSQL=FormatSQL("insert into musicvideo (idMVideo, idFile) values (NULL, %u)", lFileId);
+      CStdString strSQL=FormatSQL("insert into musicvideo (idMVideo, idFile) values (NULL, %i)", idFile);
       m_pDS->exec(strSQL.c_str());
-      lMVideoId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+      idMVideo = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
     }
 
-    return lMVideoId;
+    return idMVideo;
   }
   catch (...)
   {
@@ -1039,15 +1039,15 @@
       // doesnt exists, add it
       strSQL=FormatSQL("insert into genre (idGenre, strGenre) values( NULL, '%s')", strGenre.c_str());
       m_pDS->exec(strSQL.c_str());
-      int lGenreId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
-      return lGenreId;
+      int idGenre = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+      return idGenre;
     }
     else
     {
       const field_value value = m_pDS->fv("idGenre");
-      int lGenreId = value.get_asInt() ;
+      int idGenre = value.get_asInt() ;
       m_pDS->close();
-      return lGenreId;
+      return idGenre;
     }
   }
   catch (...)
@@ -1073,18 +1073,18 @@
       // doesnt exists, add it
       strSQL=FormatSQL("insert into Actors (idActor, strActor, strThumb) values( NULL, '%s','%s')", strActor.c_str(),strThumb.c_str());
       m_pDS->exec(strSQL.c_str());
-      int lActorId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
-      return lActorId;
+      int idActor = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+      return idActor;
     }
     else
     {
       const field_value value = m_pDS->fv("idActor");
-      int lActorId = value.get_asInt() ;
+      int idActor = value.get_asInt() ;
       // update the thumb url's
       if (!strThumb.IsEmpty())
-        strSQL=FormatSQL("update actors set strThumb='%s' where idActor=%u",strThumb.c_str(),lActorId);
+        strSQL=FormatSQL("update actors set strThumb='%s' where idActor=%i",strThumb.c_str(),idActor);
       m_pDS->close();
-      return lActorId;
+      return idActor;
     }
 
   }
@@ -1109,15 +1109,15 @@
       // doesn't exist, add it
       strSQL=FormatSQL("insert into sets (idSet, strSet) values(NULL, '%s')", strSet.c_str());
       m_pDS->exec(strSQL.c_str());
-      int lSetId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
-      return lSetId;
+      int idSet = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+      return idSet;
     }
     else
     {
       const field_value value = m_pDS->fv("idSet");
-      int lSetId = value.get_asInt() ;
+      int idSet = value.get_asInt() ;
       m_pDS->close();
-      return lSetId;
+      return idSet;
     }
 
   }
@@ -1143,15 +1143,15 @@
       // doesnt exists, add it
       strSQL=FormatSQL("insert into studio (idStudio, strStudio) values( NULL, '%s')", strStudio.c_str());
       m_pDS->exec(strSQL.c_str());
-      int lStudioId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
-      return lStudioId;
+      int idStudio = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+      return idStudio;
     }
     else
     {
       const field_value value = m_pDS->fv("idStudio");
-      int lStudioId = value.get_asInt() ;
+      int idStudio = value.get_asInt() ;
       m_pDS->close();
-      return lStudioId;
+      return idStudio;
     }
   }
   catch (...)
@@ -1169,7 +1169,7 @@
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
-    CStdString strSQL=FormatSQL("select * from %s where idActor=%u and %s=%u", table, actorID, secondField, secondID);
+    CStdString strSQL=FormatSQL("select * from %s where idActor=%i and %s=%i", table, actorID, secondField, secondID);
     m_pDS->query(strSQL.c_str());
     if (m_pDS->num_rows() == 0)
     {
@@ -1192,7 +1192,7 @@
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
-    CStdString strSQL=FormatSQL("select * from %s where %s=%u and %s=%u", table, firstField, firstID, secondField, secondID);
+    CStdString strSQL=FormatSQL("select * from %s where %s=%i and %s=%i", table, firstField, firstID, secondField, secondID);
     m_pDS->query(strSQL.c_str());
     if (m_pDS->num_rows() == 0)
     {
@@ -1209,93 +1209,93 @@
 }
 
 //****Sets****
-void CVideoDatabase::AddSetToMovie(int lMovieId, int lSetId)
+void CVideoDatabase::AddSetToMovie(int idMovie, int idSet)
 {
-  AddToLinkTable("setlinkmovie", "idSet", lSetId, "idMovie", lMovieId);
+  AddToLinkTable("setlinkmovie", "idSet", idSet, "idMovie", idMovie);
 }
 
 //****Actors****
-void CVideoDatabase::AddActorToMovie(int lMovieId, int lActorId, const CStdString& strRole)
+void CVideoDatabase::AddActorToMovie(int idMovie, int idActor, const CStdString& strRole)
 {
-  AddLinkToActor("actorlinkmovie", lActorId, "idMovie", lMovieId, strRole);
+  AddLinkToActor("actorlinkmovie", idActor, "idMovie", idMovie, strRole);
 }
 
-void CVideoDatabase::AddActorToTvShow(int lTvShowId, int lActorId, const CStdString& strRole)
+void CVideoDatabase::AddActorToTvShow(int idTvShow, int idActor, const CStdString& strRole)
 {
-  AddLinkToActor("actorlinktvshow", lActorId, "idShow", lTvShowId, strRole);
+  AddLinkToActor("actorlinktvshow", idActor, "idShow", idTvShow, strRole);
 }
 
-void CVideoDatabase::AddActorToEpisode(int lEpisodeId, int lActorId, const CStdString& strRole)
+void CVideoDatabase::AddActorToEpisode(int idEpisode, int idActor, const CStdString& strRole)
 {
-  AddLinkToActor("actorlinkepisode", lActorId, "idEpisode", lEpisodeId, strRole);
+  AddLinkToActor("actorlinkepisode", idActor, "idEpisode", idEpisode, strRole);
 }
 
-void CVideoDatabase::AddArtistToMusicVideo(int lMVideoId, int lArtistId)
+void CVideoDatabase::AddArtistToMusicVideo(int idMVideo, int idArtist)
 {
-  AddToLinkTable("artistlinkmusicvideo", "idArtist", lArtistId, "idMVideo", lMVideoId);
+  AddToLinkTable("artistlinkmusicvideo", "idArtist", idArtist, "idMVideo", idMVideo);
 }
 
 //****Directors + Writers****
-void CVideoDatabase::AddDirectorToMovie(int lMovieId, int lDirectorId)
+void CVideoDatabase::AddDirectorToMovie(int idMovie, int idDirector)
 {
-  AddToLinkTable("directorlinkmovie", "idDirector", lDirectorId, "idMovie", lMovieId);
+  AddToLinkTable("directorlinkmovie", "idDirector", idDirector, "idMovie", idMovie);
 }
 
-void CVideoDatabase::AddDirectorToTvShow(int lTvShowId, int lDirectorId)
+void CVideoDatabase::AddDirectorToTvShow(int idTvShow, int idDirector)
 {
-  AddToLinkTable("directorlinktvshow", "idDirector", lDirectorId, "idShow", lTvShowId);
+  AddToLinkTable("directorlinktvshow", "idDirector", idDirector, "idShow", idTvShow);
 }
 
-void CVideoDatabase::AddWriterToEpisode(int lEpisodeId, int lWriterId)
+void CVideoDatabase::AddWriterToEpisode(int idEpisode, int idWriter)
 {
-  AddToLinkTable("writerlinkepisode", "idWriter", lWriterId, "idEpisode", lEpisodeId);
+  AddToLinkTable("writerlinkepisode", "idWriter", idWriter, "idEpisode", idEpisode);
 }
 
-void CVideoDatabase::AddWriterToMovie(int lMovieId, int lWriterId)
+void CVideoDatabase::AddWriterToMovie(int idMovie, int idWriter)
 {
-  AddToLinkTable("writerlinkmovie", "idWriter", lWriterId, "idMovie", lMovieId);
+  AddToLinkTable("writerlinkmovie", "idWriter", idWriter, "idMovie", idMovie);
 }
 
-void CVideoDatabase::AddDirectorToEpisode(int lEpisodeId, int lDirectorId)
+void CVideoDatabase::AddDirectorToEpisode(int idEpisode, int idDirector)
 {
-  AddToLinkTable("directorlinkepisode", "idDirector", lDirectorId, "idEpisode", lEpisodeId);
+  AddToLinkTable("directorlinkepisode", "idDirector", idDirector, "idEpisode", idEpisode);
 }
 
-void CVideoDatabase::AddDirectorToMusicVideo(int lMVideoId, int lDirectorId)
+void CVideoDatabase::AddDirectorToMusicVideo(int idMVideo, int idDirector)
 {
-  AddToLinkTable("directorlinkmusicvideo", "idDirector", lDirectorId, "idMVideo", lMVideoId);
+  AddToLinkTable("directorlinkmusicvideo", "idDirector", idDirector, "idMVideo", idMVideo);
 }
 
 //****Studios****
-void CVideoDatabase::AddStudioToMovie(int lMovieId, int lStudioId)
+void CVideoDatabase::AddStudioToMovie(int idMovie, int idStudio)
 {
-  AddToLinkTable("studiolinkmovie", "idStudio", lStudioId, "idMovie", lMovieId);
+  AddToLinkTable("studiolinkmovie", "idStudio", idStudio, "idMovie", idMovie);
 }
 
-void CVideoDatabase::AddStudioToTvShow(int lTvShowId, int lStudioId)
+void CVideoDatabase::AddStudioToTvShow(int idTvShow, int idStudio)
 {
-  AddToLinkTable("studiolinktvshow", "idStudio", lStudioId, "idShow", lTvShowId);
+  AddToLinkTable("studiolinktvshow", "idStudio", idStudio, "idShow", idTvShow);
 }
 
-void CVideoDatabase::AddStudioToMusicVideo(int lMVideoId, int lStudioId)
+void CVideoDatabase::AddStudioToMusicVideo(int idMVideo, int idStudio)
 {
-  AddToLinkTable("studiolinkmusicvideo", "idStudio", lStudioId, "idMVideo", lMVideoId);
+  AddToLinkTable("studiolinkmusicvideo", "idStudio", idStudio, "idMVideo", idMVideo);
 }
 
 //****Genres****
-void CVideoDatabase::AddGenreToMovie(int lMovieId, int lGenreId)
+void CVideoDatabase::AddGenreToMovie(int idMovie, int idGenre)
 {
-  AddToLinkTable("genrelinkmovie", "idGenre", lGenreId, "idMovie", lMovieId);
+  AddToLinkTable("genrelinkmovie", "idGenre", idGenre, "idMovie", idMovie);
 }
 
-void CVideoDatabase::AddGenreToTvShow(int lTvShowId, int lGenreId)
+void CVideoDatabase::AddGenreToTvShow(int idTvShow, int idGenre)
 {
-  AddToLinkTable("genrelinktvshow", "idGenre", lGenreId, "idShow", lTvShowId);
+  AddToLinkTable("genrelinktvshow", "idGenre", idGenre, "idShow", idTvShow);
 }
 
-void CVideoDatabase::AddGenreToMusicVideo(int lMVideoId, int lGenreId)
+void CVideoDatabase::AddGenreToMusicVideo(int idMVideo, int idGenre)
 {
-  AddToLinkTable("genrelinkmusicvideo", "idGenre", lGenreId, "idMVideo", lMVideoId);
+  AddToLinkTable("genrelinkmusicvideo", "idGenre", idGenre, "idMVideo", idMVideo);
 }
 
 //********************************************************************************************************************************
@@ -1305,15 +1305,15 @@
   {
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
-    int lMovieId = GetMovieId(strFilenameAndPath);
-    return (lMovieId > 0); // index of zero is also invalid
+    int idMovie = GetMovieId(strFilenameAndPath);
+    return (idMovie > 0); // index of zero is also invalid
 
     // work in progress
-    if (lMovieId > 0)
+    if (idMovie > 0)
     {
       // get title.  if no title, the id was "deleted" for in-place update
       CVideoInfoTag details;
-      GetMovieInfo(strFilenameAndPath, details, lMovieId);
+      GetMovieInfo(strFilenameAndPath, details, idMovie);
       if (!details.m_strTitle.IsEmpty()) return true;
     }
     return false;
@@ -1331,15 +1331,15 @@
   {
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
-    int lTvShowId = GetTvShowId(strPath);
-    return (lTvShowId > 0); // index of zero is also invalid
+    int idTvShow = GetTvShowId(strPath);
+    return (idTvShow > 0); // index of zero is also invalid
 
     // work in progress
-    if (lTvShowId > 0)
+    if (idTvShow > 0)
     {
       // get title. if no title, the id was "deleted" for in-place update
       CVideoInfoTag details;
-      GetTvShowInfo(strPath, details, lTvShowId);
+      GetTvShowInfo(strPath, details, idTvShow);
       if (!details.m_strTitle.IsEmpty()) return true;
     }
     return false;
@@ -1357,15 +1357,15 @@
   {
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
-    int lEpisodeId = GetEpisodeId(strFilenameAndPath);
-    return (lEpisodeId > 0); // index of zero is also invalid
+    int idEpisode = GetEpisodeId(strFilenameAndPath);
+    return (idEpisode > 0); // index of zero is also invalid
 
     // work in progress
-    if (lEpisodeId > 0)
+    if (idEpisode > 0)
     {
       // get title.  if no title, the id was "deleted" for in-place update
       CVideoInfoTag details;
-      GetEpisodeInfo(strFilenameAndPath, details, lEpisodeId);
+      GetEpisodeInfo(strFilenameAndPath, details, idEpisode);
       if (!details.m_strTitle.IsEmpty()) return true;
     }
     return false;
@@ -1383,15 +1383,15 @@
   {
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
-    int lMVideoId = GetMusicVideoId(strFilenameAndPath);
-    return (lMVideoId > 0); // index of zero is also invalid
+    int idMVideo = GetMusicVideoId(strFilenameAndPath);
+    return (idMVideo > 0); // index of zero is also invalid
 
     // work in progress
-    if (lMVideoId > 0)
+    if (idMVideo > 0)
     {
       // get title.  if no title, the id was "deleted" for in-place update
       CVideoInfoTag details;
-      GetMusicVideoInfo(strFilenameAndPath, details, lMVideoId);
+      GetMusicVideoInfo(strFilenameAndPath, details, idMVideo);
       if (!details.m_strTitle.IsEmpty()) return true;
     }
     return false;
@@ -1410,29 +1410,29 @@
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
-    int lTvShowId = GetTvShowId(strPath);
-    if ( lTvShowId < 0) return ;
+    int idTvShow = GetTvShowId(strPath);
+    if ( idTvShow < 0) return ;
 
     CFileItemList items;
     CStdString strPath2;
-    strPath2.Format("videodb://2/2/%u/",lTvShowId);
-    GetSeasonsNav(strPath2,items,-1,-1,-1,-1,lTvShowId);
+    strPath2.Format("videodb://2/2/%i/",idTvShow);
+    GetSeasonsNav(strPath2,items,-1,-1,-1,-1,idTvShow);
     for( int i=0;i<items.Size();++i )
       XFILE::CFile::Delete(items[i]->GetCachedSeasonThumb());
 
     DeleteThumbForItem(strPath,true);
 
     CStdString strSQL;
-    strSQL=FormatSQL("delete from genrelinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from genrelinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from actorlinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from actorlinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from directorlinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from directorlinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from studiolinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from studiolinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
     // remove all info other than the id
@@ -1445,7 +1445,7 @@
       column.Format("c%02d=NULL,", iType);
       strSQL += column;
     }
-    strSQL = strSQL.Mid(0, strSQL.size() - 1) + FormatSQL(" where idShow=%i", lTvShowId);
+    strSQL = strSQL.Mid(0, strSQL.size() - 1) + FormatSQL(" where idShow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
   }
   catch (...)
@@ -1564,16 +1564,16 @@
 }
 
 //********************************************************************************************************************************
-void CVideoDatabase::GetMovieInfo(const CStdString& strFilenameAndPath, CVideoInfoTag& details, int lMovieId /* = -1 */)
+void CVideoDatabase::GetMovieInfo(const CStdString& strFilenameAndPath, CVideoInfoTag& details, int idMovie /* = -1 */)
 {
   try
   {
     // TODO: Optimize this - no need for all the queries!
-    if (lMovieId < 0)
-      lMovieId = GetMovieId(strFilenameAndPath);
-    if (lMovieId < 0) return ;
+    if (idMovie < 0)
+      idMovie = GetMovieId(strFilenameAndPath);
+    if (idMovie < 0) return ;
 
-    CStdString sql = FormatSQL("select * from movieview where idMovie=%i", lMovieId);
+    CStdString sql = FormatSQL("select * from movieview where idMovie=%i", idMovie);
     if (!m_pDS->query(sql.c_str()))
       return;
     details = GetDetailsForMovie(m_pDS, true);
@@ -1585,15 +1585,15 @@
 }
 
 //********************************************************************************************************************************
-void CVideoDatabase::GetTvShowInfo(const CStdString& strPath, CVideoInfoTag& details, int lTvShowId /* = -1 */)
+void CVideoDatabase::GetTvShowInfo(const CStdString& strPath, CVideoInfoTag& details, int idTvShow /* = -1 */)
 {
   try
   {
-    if (lTvShowId < 0)
-      lTvShowId = GetTvShowId(strPath);
-    if (lTvShowId < 0) return ;
+    if (idTvShow < 0)
+      idTvShow = GetTvShowId(strPath);
+    if (idTvShow < 0) return ;
 
-    CStdString sql = FormatSQL("select * from tvshowview where idshow=%i", lTvShowId);
+    CStdString sql = FormatSQL("select * from tvshowview where idshow=%i", idTvShow);
     if (!m_pDS->query(sql.c_str()))
       return;
     details = GetDetailsForTvShow(m_pDS, true);
@@ -1604,16 +1604,16 @@
   }
 }
 
-bool CVideoDatabase::GetEpisodeInfo(const CStdString& strFilenameAndPath, CVideoInfoTag& details, int lEpisodeId /* = -1 */)
+bool CVideoDatabase::GetEpisodeInfo(const CStdString& strFilenameAndPath, CVideoInfoTag& details, int idEpisode /* = -1 */)
 {
   try
   {
     // TODO: Optimize this - no need for all the queries!
-    if (lEpisodeId < 0)
-      lEpisodeId = GetEpisodeId(strFilenameAndPath);
-    if (lEpisodeId < 0) return false;
+    if (idEpisode < 0)
+      idEpisode = GetEpisodeId(strFilenameAndPath);
+    if (idEpisode < 0) return false;
 
-    CStdString sql = FormatSQL("select * from episodeview where idepisode=%u",lEpisodeId);
+    CStdString sql = FormatSQL("select * from episodeview where idepisode=%i",idEpisode);
     if (!m_pDS->query(sql.c_str()))
       return false;
     details = GetDetailsForEpisode(m_pDS, true);
@@ -1626,16 +1626,16 @@
   return false;
 }
 
-void CVideoDatabase::GetMusicVideoInfo(const CStdString& strFilenameAndPath, CVideoInfoTag& details, int lMVideoId /* = -1 */)
+void CVideoDatabase::GetMusicVideoInfo(const CStdString& strFilenameAndPath, CVideoInfoTag& details, int idMVideo /* = -1 */)
 {
   try
   {
     // TODO: Optimize this - no need for all the queries!
-    if (lMVideoId < 0)
-      lMVideoId = GetMusicVideoId(strFilenameAndPath);
-    if (lMVideoId < 0) return ;
+    if (idMVideo < 0)
+      idMVideo = GetMusicVideoId(strFilenameAndPath);
+    if (idMVideo < 0) return ;
 
-    CStdString sql = FormatSQL("select * from musicvideoview where idmvideo=%i", lMVideoId);
+    CStdString sql = FormatSQL("select * from musicvideoview where idmvideo=%i", idMVideo);
     if (!m_pDS->query(sql.c_str()))
       return;
     details = GetDetailsForMusicVideo(m_pDS);
@@ -1657,8 +1657,8 @@
     {
       CStdString strDirector(directors[i]);
       strDirector.Trim();
-      int lDirectorId = AddActor(strDirector,"");
-      vecDirectors.push_back(lDirectorId);
+      int idDirector = AddActor(strDirector,"");
+      vecDirectors.push_back(idDirector);
     }
   }
 
@@ -1671,8 +1671,8 @@
     {
       CStdString strGenre(genres[i]);
       strGenre.Trim();
-      int lGenreId = AddGenre(strGenre);
-      vecGenres.push_back(lGenreId);
+      int idGenre = AddGenre(strGenre);
+      vecGenres.push_back(idGenre);
     }
   }
   // add all studios
@@ -1684,8 +1684,8 @@
     {
       CStdString strStudio(studios[i]);
       strStudio.Trim();
-      int lStudioId = AddStudio(strStudio);
-      vecStudios.push_back(lStudioId);
+      int idStudio = AddStudio(strStudio);
+      vecStudios.push_back(idStudio);
     }
   }
 }
@@ -1731,20 +1731,20 @@
   {
     CVideoInfoTag info = details;
 
-    int lFileId = GetFileId(strFilenameAndPath);
+    int idFile = GetFileId(strFilenameAndPath);
 
-    if (lFileId < 0)
-      lFileId = AddFile(strFilenameAndPath);
+    if (idFile < 0)
+      idFile = AddFile(strFilenameAndPath);
 
-    int lMovieId = GetMovieId(strFilenameAndPath);
+    int idMovie = GetMovieId(strFilenameAndPath);
 
-    if (lMovieId > -1)
+    if (idMovie > -1)
       DeleteMovie(strFilenameAndPath, true); // true to keep the table entry
 
     BeginTransaction();
 
-    lMovieId = AddMovie(strFilenameAndPath);
-    if (lMovieId < 0)
+    idMovie = AddMovie(strFilenameAndPath);
+    if (idMovie < 0)
     {
       CommitTransaction();
       return;
@@ -1756,13 +1756,13 @@
     AddGenreAndDirectorsAndStudios(info,vecDirectors,vecGenres,vecStudios);
 
     for (unsigned int i = 0; i < vecGenres.size(); ++i)
-      AddGenreToMovie(lMovieId, vecGenres[i]);
+      AddGenreToMovie(idMovie, vecGenres[i]);
 
     for (unsigned int i = 0; i < vecDirectors.size(); ++i)
-      AddDirectorToMovie(lMovieId, vecDirectors[i]);
+      AddDirectorToMovie(idMovie, vecDirectors[i]);
 
     for (unsigned int i = 0; i < vecStudios.size(); ++i)
-      AddStudioToMovie(lMovieId, vecStudios[i]);
+      AddStudioToMovie(idMovie, vecStudios[i]);
 
     // add writers...
     if (!info.m_strWritingCredits.IsEmpty())
@@ -1773,16 +1773,16 @@
       {
         CStdString writer(writers[i]);
         writer.Trim();
-        int lWriterId = AddActor(writer,"");
-        AddWriterToMovie(lMovieId, lWriterId );
+        int idWriter = AddActor(writer,"");
+        AddWriterToMovie(idMovie, idWriter );
       }
     }
 
     // add cast...
     for (CVideoInfoTag::iCast it = info.m_cast.begin(); it != info.m_cast.end(); ++it)
     {
-      int lActor = AddActor(it->strName,it->thumbUrl.m_xml);
-      AddActorToMovie(lMovieId, lActor, it->strRole);
+      int idActor = AddActor(it->strName,it->thumbUrl.m_xml);
+      AddActorToMovie(idMovie, idActor, it->strRole);
     }
 
     // add sets...
@@ -1795,17 +1795,17 @@
         CStdString set(sets[i]);
         set.Trim();
         int lSet = AddSet(set);
-        AddSetToMovie(lMovieId, lSet);
+        AddSetToMovie(idMovie, lSet);
       }
     }
     
     if (details.HasStreamDetails())
-      SetStreamDetailsForFileId(details.m_streamDetails, lFileId);
+      SetStreamDetailsForFileId(details.m_streamDetails, idFile);
 
     // update our movie table (we know it was added already above)
     // and insert the new row
     CStdString sql = "update movie set " + GetValueString(info, VIDEODB_ID_MIN, VIDEODB_ID_MAX, DbMovieOffsets);
-    sql += FormatSQL(" where idMovie=%u", lMovieId);
+    sql += FormatSQL(" where idMovie=%i", idMovie);
     m_pDS->exec(sql.c_str());
     CommitTransaction();
   }
@@ -1827,9 +1827,9 @@
 
     BeginTransaction();
 
-    int lTvShowId = GetTvShowId(strPath);
-    if (lTvShowId < 0)
-      lTvShowId = AddTvShow(strPath);
+    int idTvShow = GetTvShowId(strPath);
+    if (idTvShow < 0)
+      idTvShow = AddTvShow(strPath);
 
     vector<int> vecDirectors;
     vector<int> vecGenres;
@@ -1839,32 +1839,32 @@
     // add cast...
     for (CVideoInfoTag::iCast it = details.m_cast.begin(); it != details.m_cast.end(); ++it)
     {
-      int lActor = AddActor(it->strName,it->thumbUrl.m_xml);
-      AddActorToTvShow(lTvShowId, lActor, it->strRole);
+      int idActor = AddActor(it->strName,it->thumbUrl.m_xml);
+      AddActorToTvShow(idTvShow, idActor, it->strRole);
     }
 
     unsigned int i;
     for (i = 0; i < vecGenres.size(); ++i)
     {
-      AddGenreToTvShow(lTvShowId, vecGenres[i]);
+      AddGenreToTvShow(idTvShow, vecGenres[i]);
     }
 
     for (i = 0; i < vecDirectors.size(); ++i)
     {
-      AddDirectorToTvShow(lTvShowId, vecDirectors[i]);
+      AddDirectorToTvShow(idTvShow, vecDirectors[i]);
     }
 
     for (i = 0; i < vecStudios.size(); ++i)
     {
-      AddStudioToTvShow(lTvShowId, vecStudios[i]);
+      AddStudioToTvShow(idTvShow, vecStudios[i]);
     }
 
     // and insert the new row
     CStdString sql = "update tvshow set " + GetValueString(details, VIDEODB_ID_TV_MIN, VIDEODB_ID_TV_MAX, DbTvShowOffsets);
-    sql += FormatSQL("where idShow=%u", lTvShowId);
+    sql += FormatSQL("where idShow=%i", idTvShow);
     m_pDS->exec(sql.c_str());
     CommitTransaction();
-    return lTvShowId;
+    return idTvShow;
   }
   catch (...)
   {
@@ -1874,19 +1874,19 @@
   return -1;
 }
 
-int CVideoDatabase::SetDetailsForEpisode(const CStdString& strFilenameAndPath, const CVideoInfoTag& details, int idShow, int lEpisodeId)
+int CVideoDatabase::SetDetailsForEpisode(const CStdString& strFilenameAndPath, const CVideoInfoTag& details, int idShow, int idEpisode)
 {
   try
   {
     BeginTransaction();
-    if (lEpisodeId == -1)
+    if (idEpisode == -1)
     {
-      lEpisodeId = GetEpisodeId(strFilenameAndPath);
-      if (lEpisodeId > 0)
-        DeleteEpisode(strFilenameAndPath,lEpisodeId);
+      idEpisode = GetEpisodeId(strFilenameAndPath);
+      if (idEpisode > 0)
+        DeleteEpisode(strFilenameAndPath,idEpisode);
 
-      lEpisodeId = AddEpisode(idShow,strFilenameAndPath);
-      if (lEpisodeId < 0)
+      idEpisode = AddEpisode(idShow,strFilenameAndPath);
+      if (idEpisode < 0)
       {
         CommitTransaction();
         return -1;
@@ -1901,8 +1901,8 @@
     // add cast...
     for (CVideoInfoTag::iCast it = details.m_cast.begin(); it != details.m_cast.end(); ++it)
     {
-      int lActor = AddActor(it->strName,it->thumbUrl.m_xml);
-      AddActorToEpisode(lEpisodeId, lActor, it->strRole);
+      int idActor = AddActor(it->strName,it->thumbUrl.m_xml);
+      AddActorToEpisode(idEpisode, idActor, it->strRole);
     }
 
     // add writers...
@@ -1914,14 +1914,14 @@
       {
         CStdString writer(writers[i]);
         writer.Trim();
-        int lWriterId = AddActor(writer,"");
-        AddWriterToEpisode(lEpisodeId, lWriterId );
+        int idWriter = AddActor(writer,"");
+        AddWriterToEpisode(idEpisode, idWriter );
       }
     }
 
     for (unsigned int i = 0; i < vecDirectors.size(); ++i)
     {
-      AddDirectorToEpisode(lEpisodeId, vecDirectors[i]);
+      AddDirectorToEpisode(idEpisode, vecDirectors[i]);
     }
 
     if (details.HasStreamDetails())
@@ -1934,10 +1934,10 @@
 
     // and insert the new row
     CStdString sql = "update episode set " + GetValueString(details, VIDEODB_ID_EPISODE_MIN, VIDEODB_ID_EPISODE_MAX, DbEpisodeOffsets);
-    sql += FormatSQL("where idEpisode=%u", lEpisodeId);
+    sql += FormatSQL("where idEpisode=%i", idEpisode);
     m_pDS->exec(sql.c_str());
     CommitTransaction();
-    return lEpisodeId;
+    return idEpisode;
   }
   catch (...)
   {
@@ -1952,16 +1952,16 @@
   {
     BeginTransaction();
 
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
-      lFileId = AddFile(strFilenameAndPath);
-    int lMVideoId = GetMusicVideoId(strFilenameAndPath);
-    if (lMVideoId > -1)
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
+      idFile = AddFile(strFilenameAndPath);
+    int idMVideo = GetMusicVideoId(strFilenameAndPath);
+    if (idMVideo > -1)
     {
       DeleteMusicVideo(strFilenameAndPath);
     }
-    lMVideoId = AddMusicVideo(strFilenameAndPath);
-    if (lMVideoId < 0)
+    idMVideo = AddMusicVideo(strFilenameAndPath);
+    if (idMVideo < 0)
     {
       CommitTransaction();
       return;
@@ -1981,34 +1981,34 @@
       {
         CStdString artist = vecArtists[i];
         artist.Trim();
-        int lArtist = AddActor(artist,"");
-        AddArtistToMusicVideo(lMVideoId, lArtist);
+        int idArtist = AddActor(artist,"");
+        AddArtistToMusicVideo(idMVideo, idArtist);
       }
     }
 
     unsigned int i;
     for (i = 0; i < vecGenres.size(); ++i)
     {
-      AddGenreToMusicVideo(lMVideoId, vecGenres[i]);
+      AddGenreToMusicVideo(idMVideo, vecGenres[i]);
     }
 
     for (i = 0; i < vecDirectors.size(); ++i)
     {
-      AddDirectorToMusicVideo(lMVideoId, vecDirectors[i]);
+      AddDirectorToMusicVideo(idMVideo, vecDirectors[i]);
     }
 
     for (i = 0; i < vecStudios.size(); ++i)
     {
-      AddStudioToMusicVideo(lMVideoId, vecStudios[i]);
+      AddStudioToMusicVideo(idMVideo, vecStudios[i]);
     }
 
     if (details.HasStreamDetails())
-      SetStreamDetailsForFileId(details.m_streamDetails, lFileId);
+      SetStreamDetailsForFileId(details.m_streamDetails, idFile);
 
     // update our movie table (we know it was added already above)
     // and insert the new row
     CStdString sql = "update musicvideo set " + GetValueString(details, VIDEODB_ID_MUSICVIDEO_MIN, VIDEODB_ID_MUSICVIDEO_MAX, DbMusicVideoOffsets);
-    sql += FormatSQL(" where idMVideo=%u", lMVideoId);
+    sql += FormatSQL(" where idMVideo=%i", idMVideo);
     m_pDS->exec(sql.c_str());
     CommitTransaction();
   }
@@ -2021,28 +2021,28 @@
 void CVideoDatabase::SetStreamDetailsForFile(const CStreamDetails& details, const CStdString &strFileNameAndPath)
 {
   // AddFile checks to make sure the file isn't already in the DB first
-  int lFileId = AddFile(strFileNameAndPath);
-  if (lFileId < 0)
+  int idFile = AddFile(strFileNameAndPath);
+  if (idFile < 0)
     return;
-  SetStreamDetailsForFileId(details, lFileId);
+  SetStreamDetailsForFileId(details, idFile);
 }
 
-void CVideoDatabase::SetStreamDetailsForFileId(const CStreamDetails& details, int lFileId)
+void CVideoDatabase::SetStreamDetailsForFileId(const CStreamDetails& details, int idFile)
 {
-  if (lFileId < 0)
+  if (idFile < 0)
     return;
 
   try
   {
     BeginTransaction();
-    m_pDS->exec(FormatSQL("DELETE FROM streamdetails WHERE idFile = %u", lFileId));
+    m_pDS->exec(FormatSQL("DELETE FROM streamdetails WHERE idFile = %i", idFile));
 
     for (int i=1; i<=details.GetVideoStreamCount(); i++)
     {
       m_pDS->exec(FormatSQL("INSERT INTO streamdetails "
         "(idFile, iStreamType, strVideoCodec, fVideoAspect, iVideoWidth, iVideoHeight) "
-        "VALUES (%u,%i,'%s',%f,%i,%i)",
-        lFileId, (int)CStreamDetail::VIDEO,
+        "VALUES (%i,%i,'%s',%f,%i,%i)",
+        idFile, (int)CStreamDetail::VIDEO,
         details.GetVideoCodec(i).c_str(), details.GetVideoAspect(i),
         details.GetVideoWidth(i), details.GetVideoHeight(i)));
     }
@@ -2050,8 +2050,8 @@
     {
       m_pDS->exec(FormatSQL("INSERT INTO streamdetails "
         "(idFile, iStreamType, strAudioCodec, iAudioChannels, strAudioLanguage) "
-        "VALUES (%u,%i,'%s',%i,'%s')",
-        lFileId, (int)CStreamDetail::AUDIO,
+        "VALUES (%i,%i,'%s',%i,'%s')",
+        idFile, (int)CStreamDetail::AUDIO,
         details.GetAudioCodec(i).c_str(), details.GetAudioChannels(i),
         details.GetAudioLanguage(i).c_str()));
     }
@@ -2059,8 +2059,8 @@
     {
       m_pDS->exec(FormatSQL("INSERT INTO streamdetails "
         "(idFile, iStreamType, strSubtitleLanguage) "
-        "VALUES (%u,%i,'%s')",
-        lFileId, (int)CStreamDetail::SUBTITLE,
+        "VALUES (%i,%i,'%s')",
+        idFile, (int)CStreamDetail::SUBTITLE,
         details.GetSubtitleLanguage(i).c_str()));
     }
 
@@ -2069,29 +2069,29 @@
   catch (...)
   {
     RollbackTransaction();
-    CLog::Log(LOGERROR, "%s (%lu) failed", __FUNCTION__, lFileId);
+    CLog::Log(LOGERROR, "%s (%i) failed", __FUNCTION__, idFile);
   }
 }
 
 //********************************************************************************************************************************
-void CVideoDatabase::GetFilePathById(int lMovieId, CStdString &filePath, VIDEODB_CONTENT_TYPE iType)
+void CVideoDatabase::GetFilePathById(int idMovie, CStdString &filePath, VIDEODB_CONTENT_TYPE iType)
 {
   try
   {
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
-    if (lMovieId < 0) return ;
+    if (idMovie < 0) return ;
 
     CStdString strSQL;
     if (iType == VIDEODB_CONTENT_MOVIES)
-      strSQL=FormatSQL("select path.strPath,files.strFileName from path, files, movie where path.idPath=files.idPath and files.idFile=movie.idFile and movie.idMovie=%u order by strFilename", lMovieId );
+      strSQL=FormatSQL("select path.strPath,files.strFileName from path, files, movie where path.idPath=files.idPath and files.idFile=movie.idFile and movie.idMovie=%i order by strFilename", idMovie );
     if (iType == VIDEODB_CONTENT_EPISODES)
-      strSQL=FormatSQL("select path.strPath,files.strFileName from path, files, episode where path.idPath=files.idPath and files.idFile=episode.idFile and episode.idEpisode=%u order by strFilename", lMovieId );
+      strSQL=FormatSQL("select path.strPath,files.strFileName from path, files, episode where path.idPath=files.idPath and files.idFile=episode.idFile and episode.idEpisode=%i order by strFilename", idMovie );
     if (iType == VIDEODB_CONTENT_TVSHOWS)
-      strSQL=FormatSQL("select path.strPath from path,tvshowlinkpath where path.idpath=tvshowlinkpath.idpath and tvshowlinkpath.idshow=%i", lMovieId );
+      strSQL=FormatSQL("select path.strPath from path,tvshowlinkpath where path.idpath=tvshowlinkpath.idpath and tvshowlinkpath.idshow=%i", idMovie );
     if (iType ==VIDEODB_CONTENT_MUSICVIDEOS)
-      strSQL=FormatSQL("select path.strPath,files.strFileName from path, files, musicvideo where path.idPath=files.idPath and files.idFile=musicvideo.idFile and musicvideo.idmvideo=%u order by strFilename", lMovieId );
+      strSQL=FormatSQL("select path.strPath,files.strFileName from path, files, musicvideo where path.idPath=files.idPath and files.idFile=musicvideo.idFile and musicvideo.idmvideo=%i order by strFilename", idMovie );
 
     m_pDS->query( strSQL.c_str() );
     if (!m_pDS->eof())
@@ -2117,14 +2117,14 @@
 {
   try
   {
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0) return ;
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0) return ;
     if (!bAppend)
       bookmarks.erase(bookmarks.begin(), bookmarks.end());
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
-    CStdString strSQL=FormatSQL("select * from bookmark where idFile=%i and type=%i order by timeInSeconds", lFileId, (int)type);
+    CStdString strSQL=FormatSQL("select * from bookmark where idFile=%i and type=%i order by timeInSeconds", idFile, (int)type);
     m_pDS->query( strSQL.c_str() );
     while (!m_pDS->eof())
     {
@@ -2211,14 +2211,14 @@
 {
   try
   {
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
     {
       // Doesn't exist in the database yet - add it.
       // TODO: It doesn't appear to me that the CDLabel parameter or the subtitles
       // parameter is anywhere in use in XBMC.
-      lFileId = AddFile(strFilenameAndPath);
-      if (lFileId < 0)
+      idFile = AddFile(strFilenameAndPath);
+      if (idFile < 0)
         return;
     }
     if (NULL == m_pDB.get()) return ;
@@ -2228,14 +2228,14 @@
     int idBookmark=-1;
     if (type == CBookmark::RESUME) // get the same resume mark bookmark each time type
     {
-      strSQL=FormatSQL("select idBookmark from bookmark where idFile=%i and type=1", lFileId);
+      strSQL=FormatSQL("select idBookmark from bookmark where idFile=%i and type=1", idFile);
     }
     else if (type == CBookmark::STANDARD) // get the same bookmark again, and update. not sure here as a dvd can have same time in multiple places, state will differ thou
     {
       /* get a bookmark within the same time as previous */
       double mintime = bookmark.timeInSeconds - 0.5f;
       double maxtime = bookmark.timeInSeconds + 0.5f;
-      strSQL=FormatSQL("select idBookmark from bookmark where idFile=%i and type=%i and (timeInSeconds between %f and %f) and playerState='%s'", lFileId, (int)type, mintime, maxtime, bookmark.playerState.c_str());
+      strSQL=FormatSQL("select idBookmark from bookmark where idFile=%i and type=%i and (timeInSeconds between %f and %f) and playerState='%s'", idFile, (int)type, mintime, maxtime, bookmark.playerState.c_str());
     }
 
     if (type != CBookmark::EPISODE)
@@ -2250,7 +2250,7 @@
     if (idBookmark >= 0 )
       strSQL=FormatSQL("update bookmark set timeInSeconds = %f, totalTimeInSeconds = %f, thumbNailImage = '%s', player = '%s', playerState = '%s' where idBookmark = %i", bookmark.timeInSeconds, bookmark.totalTimeInSeconds, bookmark.thumbNailImage.c_str(), bookmark.player.c_str(), bookmark.playerState.c_str(), idBookmark);
     else
-      strSQL=FormatSQL("insert into bookmark (idBookmark, idFile, timeInSeconds, totalTimeInSeconds, thumbNailImage, player, playerState, type) values(NULL,%i,%f,%f,'%s','%s','%s', %i)", lFileId, bookmark.timeInSeconds, bookmark.totalTimeInSeconds, bookmark.thumbNailImage.c_str(), bookmark.player.c_str(), bookmark.playerState.c_str(), (int)type);
+      strSQL=FormatSQL("insert into bookmark (idBookmark, idFile, timeInSeconds, totalTimeInSeconds, thumbNailImage, player, playerState, type) values(NULL,%i,%f,%f,'%s','%s','%s', %i)", idFile, bookmark.timeInSeconds, bookmark.totalTimeInSeconds, bookmark.thumbNailImage.c_str(), bookmark.player.c_str(), bookmark.playerState.c_str(), (int)type);
 
     m_pDS->exec(strSQL.c_str());
   }
@@ -2264,8 +2264,8 @@
 {
   try
   {
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0) return ;
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0) return ;
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
@@ -2273,7 +2273,7 @@
     /* should be no problem since we never add bookmarks that are closer than that   */
     double mintime = bookmark.timeInSeconds - 0.5f;
     double maxtime = bookmark.timeInSeconds + 0.5f;
-    CStdString strSQL = FormatSQL("select idBookmark from bookmark where idFile=%i and type=%i and playerState like '%s' and player like '%s' and (timeInSeconds between %f and %f)", lFileId, type, bookmark.playerState.c_str(), bookmark.player.c_str(), mintime, maxtime);
+    CStdString strSQL = FormatSQL("select idBookmark from bookmark where idFile=%i and type=%i and playerState like '%s' and player like '%s' and (timeInSeconds between %f and %f)", idFile, type, bookmark.playerState.c_str(), bookmark.player.c_str(), mintime, maxtime);
 
     m_pDS->query( strSQL.c_str() );
     if (m_pDS->num_rows() != 0)
@@ -2283,7 +2283,7 @@
       m_pDS->exec(strSQL.c_str());
       if (type == CBookmark::EPISODE)
       {
-        strSQL=FormatSQL("update episode set c%02d=-1 where idFile=%i and c%02d=%i", VIDEODB_ID_EPISODE_BOOKMARK, lFileId, VIDEODB_ID_EPISODE_BOOKMARK, idBookmark);
+        strSQL=FormatSQL("update episode set c%02d=-1 where idFile=%i and c%02d=%i", VIDEODB_ID_EPISODE_BOOKMARK, idFile, VIDEODB_ID_EPISODE_BOOKMARK, idBookmark);
         m_pDS->exec(strSQL.c_str());
       }
     }
@@ -2301,16 +2301,16 @@
 {
   try
   {
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0) return ;
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0) return ;
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
-    CStdString strSQL=FormatSQL("delete from bookmark where idFile=%i and type=%i", lFileId, (int)type);
+    CStdString strSQL=FormatSQL("delete from bookmark where idFile=%i and type=%i", idFile, (int)type);
     m_pDS->exec(strSQL.c_str());
     if (type == CBookmark::EPISODE)
     {
-      strSQL=FormatSQL("update episode set c%02d=-1 where idFile=%i", VIDEODB_ID_EPISODE_BOOKMARK, lFileId);
+      strSQL=FormatSQL("update episode set c%02d=-1 where idFile=%i", VIDEODB_ID_EPISODE_BOOKMARK, idFile);
       m_pDS->exec(strSQL.c_str());
     }
   }
@@ -2355,14 +2355,14 @@
 {
   try
   {
-    int lFileId = GetFileId(tag.m_strFileNameAndPath);
+    int idFile = GetFileId(tag.m_strFileNameAndPath);
     // delete the current episode for the selected episode number
-    CStdString strSQL = FormatSQL("delete from bookmark where idBookmark in (select c%02d from episode where c%02d=%i and c%02d=%i and idFile=%i)", VIDEODB_ID_EPISODE_BOOKMARK, VIDEODB_ID_EPISODE_SEASON, tag.m_iSeason, VIDEODB_ID_EPISODE_EPISODE, tag.m_iEpisode, lFileId);
+    CStdString strSQL = FormatSQL("delete from bookmark where idBookmark in (select c%02d from episode where c%02d=%i and c%02d=%i and idFile=%i)", VIDEODB_ID_EPISODE_BOOKMARK, VIDEODB_ID_EPISODE_SEASON, tag.m_iSeason, VIDEODB_ID_EPISODE_EPISODE, tag.m_iEpisode, idFile);
     m_pDS->exec(strSQL.c_str());
 
     AddBookMarkToFile(tag.m_strFileNameAndPath, bookmark, CBookmark::EPISODE);
-    int lBookmarkId = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
-    strSQL = FormatSQL("update episode set c%02d=%i where c%02d=%i and c%02d=%i and idFile=%i", VIDEODB_ID_EPISODE_BOOKMARK, lBookmarkId, VIDEODB_ID_EPISODE_SEASON, tag.m_iSeason, VIDEODB_ID_EPISODE_EPISODE, tag.m_iEpisode, lFileId);
+    int idBookmark = (int)sqlite3_last_insert_rowid(m_pDB->getHandle());
+    strSQL = FormatSQL("update episode set c%02d=%i where c%02d=%i and c%02d=%i and idFile=%i", VIDEODB_ID_EPISODE_BOOKMARK, idBookmark, VIDEODB_ID_EPISODE_SEASON, tag.m_iSeason, VIDEODB_ID_EPISODE_EPISODE, tag.m_iEpisode, idFile);
     m_pDS->exec(strSQL.c_str());
   }
   catch (...)
@@ -2393,38 +2393,38 @@
   {
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
-    int lMovieId = GetMovieId(strFilenameAndPath);
-    if (lMovieId < 0)
+    int idMovie = GetMovieId(strFilenameAndPath);
+    if (idMovie < 0)
     {
       return ;
     }
 
-    int lFileId = GetFileId(strFilenameAndPath);
-    if (lFileId < 0)
+    int idFile = GetFileId(strFilenameAndPath);
+    if (idFile < 0)
       return ;
 
     BeginTransaction();
 
     CStdString strSQL;
-    strSQL=FormatSQL("delete from genrelinkmovie where idmovie=%i", lMovieId);
+    strSQL=FormatSQL("delete from genrelinkmovie where idmovie=%i", idMovie);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from actorlinkmovie where idmovie=%i", lMovieId);
+    strSQL=FormatSQL("delete from actorlinkmovie where idmovie=%i", idMovie);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from directorlinkmovie where idmovie=%i", lMovieId);
+    strSQL=FormatSQL("delete from directorlinkmovie where idmovie=%i", idMovie);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from studiolinkmovie where idmovie=%i", lMovieId);
+    strSQL=FormatSQL("delete from studiolinkmovie where idmovie=%i", idMovie);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from setlinkmovie where idmovie=%i", lMovieId);
+    strSQL=FormatSQL("delete from setlinkmovie where idmovie=%i", idMovie);
     m_pDS->exec(strSQL.c_str());
 
     if (!bKeepThumb)
       DeleteThumbForItem(strFilenameAndPath,false);
 
-    DeleteStreamDetails(lFileId);
+    DeleteStreamDetails(idFile);
 
     // keep the movie table entry, linking to tv shows, and bookmarks
     // so we can update the data in place
@@ -2433,10 +2433,10 @@
     {
       ClearBookMarksOfFile(strFilenameAndPath);
 
-      strSQL=FormatSQL("delete from movie where idmovie=%i", lMovieId);
+      strSQL=FormatSQL("delete from movie where idmovie=%i", idMovie);
       m_pDS->exec(strSQL.c_str());
 
-      strSQL=FormatSQL("delete from movielinktvshow where idmovie=%i", lMovieId);
+      strSQL=FormatSQL("delete from movielinktvshow where idmovie=%i", idMovie);
       m_pDS->exec(strSQL.c_str());
     }
     /*
@@ -2444,7 +2444,7 @@
     else
     {
       // clear the title
-      strSQL=FormatSQL("update movie set c%02d=NULL where idmovie=%i", VIDEODB_ID_TITLE, lMovieId);
+      strSQL=FormatSQL("update movie set c%02d=NULL where idmovie=%i", VIDEODB_ID_TITLE, idMovie);
       m_pDS->exec(strSQL.c_str());
     }
     */
@@ -2464,18 +2464,18 @@
 {
   try
   {
-    int lTvShowId=-1;
+    int idTvShow=-1;
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
-    lTvShowId = GetTvShowId(strPath);
-    if (lTvShowId < 0)
+    idTvShow = GetTvShowId(strPath);
+    if (idTvShow < 0)
     {
       return ;
     }
 
     BeginTransaction();
 
-    CStdString strSQL=FormatSQL("select tvshowlinkepisode.idepisode,path.strPath,files.strFileName from tvshowlinkepisode,path,files,episode where tvshowlinkepisode.idshow=%u and tvshowlinkepisode.idepisode=episode.idEpisode and episode.idFile=files.idFile and files.idPath=path.idPath",lTvShowId);
+    CStdString strSQL=FormatSQL("select tvshowlinkepisode.idepisode,path.strPath,files.strFileName from tvshowlinkepisode,path,files,episode where tvshowlinkepisode.idshow=%i and tvshowlinkepisode.idepisode=episode.idEpisode and episode.idFile=files.idFile and files.idPath=path.idPath",idTvShow);
     m_pDS2->query(strSQL.c_str());
     while (!m_pDS2->eof())
     {
@@ -2487,19 +2487,19 @@
       m_pDS2->next();
     }
 
-    strSQL=FormatSQL("delete from genrelinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from genrelinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from actorlinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from actorlinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from directorlinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from directorlinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from tvshowlinkpath where idshow=%u", lTvShowId);
+    strSQL=FormatSQL("delete from tvshowlinkpath where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from studiolinktvshow where idshow=%i", lTvShowId);
+    strSQL=FormatSQL("delete from studiolinktvshow where idshow=%i", idTvShow);
     m_pDS->exec(strSQL.c_str());
 
     if (!bKeepThumb)
@@ -2508,10 +2508,10 @@
     // keep tvshow table and movielink table so we can update data in place
     if (!bKeepId)
     {
-      strSQL=FormatSQL("delete from tvshow where idshow=%i", lTvShowId);
+      strSQL=FormatSQL("delete from tvshow where idshow=%i", idTvShow);
       m_pDS->exec(strSQL.c_str());
 
-      strSQL=FormatSQL("delete from movielinktvshow where idshow=%i", lTvShowId);
+      strSQL=FormatSQL("delete from movielinktvshow where idshow=%i", idTvShow);
       m_pDS->exec(strSQL.c_str());
     }
 
@@ -2525,42 +2525,42 @@
   }
 }
 
-void CVideoDatabase::DeleteEpisode(const CStdString& strFilenameAndPath, int lEpisodeId, bool bKeepId /* = false */, bool bKeepThumb /* = false */)
+void CVideoDatabase::DeleteEpisode(const CStdString& strFilenameAndPath, int idEpisode, bool bKeepId /* = false */, bool bKeepThumb /* = false */)
 {
   try
   {
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
-    if (lEpisodeId < 0)
+    if (idEpisode < 0)
     {
-      lEpisodeId = GetEpisodeId(strFilenameAndPath);
-      if (lEpisodeId < 0)
+      idEpisode = GetEpisodeId(strFilenameAndPath);
+      if (idEpisode < 0)
       {

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 23277
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23277&view=rev
Author:   alwinus
Date:     2009-09-30 20:49:46 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
added: Ticket #7187, TV Teletext support for DVB EBU Teletext streams

Modified Paths:
--------------
    trunk/guilib/Key.h
    trunk/language/English/strings.xml
    trunk/language/German/strings.xml
    trunk/project/VS2008Express/XBMC.vcproj
    trunk/skin/PM3.HD/720p/VideoOSD.xml
    trunk/skin/PM3.HD/720p/custom_SkinSetting_1111.xml
    trunk/skin/PM3.HD/language/English/strings.xml
    trunk/skin/PM3.HD/language/German/strings.xml
    trunk/system/Lircmap.xml
    trunk/system/keymaps/keyboard.xml
    trunk/system/keymaps/remote.xml
    trunk/xbmc/Application.cpp
    trunk/xbmc/ButtonTranslator.cpp
    trunk/xbmc/GUISettings.cpp
    trunk/xbmc/GUIWindowFullScreen.cpp
    trunk/xbmc/GUIWindowOSD.cpp
    trunk/xbmc/Makefile
    trunk/xbmc/XBIRRemote.h
    trunk/xbmc/cores/IPlayer.h
    trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h
    trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
    trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp
    trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
    trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    trunk/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
    trunk/xbmc/cores/dvdplayer/DVDPlayer.cpp
    trunk/xbmc/cores/dvdplayer/DVDPlayer.h
    trunk/xbmc/cores/dvdplayer/Makefile
    trunk/xbmc/cores/ffmpeg/avcodec.h
    trunk/xbmc/cores/paplayer/MPCCodec/include/config.h.in
    trunk/xbmc/utils/GUIInfoManager.cpp
    trunk/xbmc/utils/GUIInfoManager.h
    trunk/xbmc/utils/Makefile

Added Paths:
-----------
    trunk/media/Fonts/teletext.ttf
    trunk/xbmc/GUIDialogTeletext.cpp
    trunk/xbmc/GUIDialogTeletext.h
    trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp
    trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.h
    trunk/xbmc/utils/Teletext.cpp
    trunk/xbmc/utils/Teletext.h
    trunk/xbmc/utils/TeletextDefines.h

Modified: trunk/guilib/Key.h
===================================================================
--- trunk/guilib/Key.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/guilib/Key.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -276,6 +276,11 @@
 #define ACTION_RELOAD_KEYMAPS         203 // reloads CButtonTranslator's keymaps
 #define ACTION_GUIPROFILE_BEGIN       204 // start the GUIControlProfiler running
 
+#define ACTION_TELETEXT_RED           215 // Teletext Color buttons to control TopText
+#define ACTION_TELETEXT_GREEN         216 //    "       "      "    "     "       "
+#define ACTION_TELETEXT_YELLOW        217 //    "       "      "    "     "       "
+#define ACTION_TELETEXT_BLUE          218 //    "       "      "    "     "       "
+
 // Window ID defines to make the code a bit more readable
 #define WINDOW_INVALID                     9999
 #define WINDOW_HOME                       10000
@@ -354,6 +359,8 @@
 #define WINDOW_MUSIC_NAV                  10502
 #define WINDOW_MUSIC_PLAYLIST_EDITOR      10503
 
+#define WINDOW_DIALOG_OSD_TELETEXT        10600
+
 //#define WINDOW_VIRTUAL_KEYBOARD           11000
 #define WINDOW_DIALOG_SELECT              12000
 #define WINDOW_MUSIC_INFO                 12001

Modified: trunk/language/English/strings.xml
===================================================================
--- trunk/language/English/strings.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/language/English/strings.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -2110,6 +2110,8 @@
   <string id="23000">Weather plugin</string>
   <string id="23001">- Plugin settings</string>
 
+  <string id="23050">Activate Teletext</string>
+
   <!-- strings 23100 thru 23150 reserved for external player -->
   <string id="23100">External Player Active</string>
   <string id="23101">Click OK to terminate the player</string>

Modified: trunk/language/German/strings.xml
===================================================================
--- trunk/language/German/strings.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/language/German/strings.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -1954,6 +1954,7 @@
   <string id="22043">schwarz/weiß</string>
   <string id="23000">Wetter-Plugin</string>
   <string id="23001">- Plugin Einstellungen</string>
+  <string id="23050">Videotext aktivtieren</string>
   <string id="29800">Datenbankmodus</string>
   <string id="29801">QWERTY Tastatur</string>
   <string id="29999">Automatische Videofilter-Korrektur für Spiele</string>

Added: trunk/media/Fonts/teletext.ttf
===================================================================
(Binary files differ)


Property changes on: trunk/media/Fonts/teletext.ttf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/project/VS2008Express/XBMC.vcproj
===================================================================
--- trunk/project/VS2008Express/XBMC.vcproj	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/project/VS2008Express/XBMC.vcproj	2009-09-30 20:49:46 UTC (rev 23277)
@@ -235,7 +235,7 @@
 				InlineFunctionExpansion="0"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Platinum\Thirdparty\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Platinum\Thirdparty\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;&quot;..\..\xbmc\lib\libSDL-WIN32\include&quot;;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib"
+				AdditionalIncludeDirectories="..\..\xbmc\cores\dvdplayer;..\..\xbmc\win32;..\..\xbmc\cores;..\..\xbmc\;..\..\xbmc\utils;..\..\guilib\;..\..\;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\xbmc\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\xbmc\lib\libUPnP\Platinum\Source\Core;..\..\xbmc\lib\libUPnP\Platinum\Thirdparty\Neptune\Source\Core;..\..\xbmc\lib\libUPnP\Platinum\Thirdparty\Neptune\Source\System\Win32;..\..\xbmc\cores\dvdplayer\DVDCodecs\Overlay;..\..\xbmc\FileSystem;..\..\xbmc\lib\libRTMP;..\..\xbmc\lib\boost;&quot;..\..\xbmc\lib\libSDL-WIN32\include&quot;;..\..\xbmc\lib\libPython\Python\PC;..\..\xbmc\lib\libsamplerate\src;..\..\xbmc\lib;..\..\guilib\freetype2\include"
 				PreprocessorDefinitions="_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;WINVER=0x0500;NOMINMAX;_USE_32BIT_TIME_T;HAS_DX"
 				StringPooling="false"
 				MinimalRebuild="false"
@@ -714,6 +714,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\xbmc\cores\dvdplayer\DVDPlayerTeletext.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\xbmc\cores\dvdplayer\DVDPlayerVideo.cpp"
 					>
 				</File>
@@ -3158,6 +3166,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\xbmc\utils\Teletext.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\xbmc\utils\Teletext.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\xbmc\Temperature.cpp"
 					>
 				</File>
@@ -3506,6 +3522,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\xbmc\GUIDialogTeletext.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\xbmc\GUIDialogTeletext.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\xbmc\GUIDialogVideoBookmarks.cpp"
 					>
 				</File>
@@ -5759,6 +5783,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\xbmc\utils\TeletextDefines.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\xbmc\Temperature.h"
 				>
 			</File>

Modified: trunk/skin/PM3.HD/720p/VideoOSD.xml
===================================================================
--- trunk/skin/PM3.HD/720p/VideoOSD.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/skin/PM3.HD/720p/VideoOSD.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -116,6 +116,15 @@
 				<texture>osd_panel.png</texture>
 				<visible>yes</visible>
 			</control>
+			<control type="image">
+				<description>Teletext Button</description>
+				<posx>138</posx>
+				<posy>15</posy>
+				<width>74</width>
+				<height>66</height>
+				<texture>osd_button_lyrics.png</texture>
+				<visible>VideoPlayer.HasTeletext + Skin.HasSetting(Player_Show_Teletext_Button)</visible>
+			</control>
 			<control type="button" id="210">
 				<description>Skip Bwd</description>
 				<posx>32</posx>
@@ -223,7 +232,25 @@
 				<onright>215</onright>
 				<onup>919</onup>
 				<ondown>921</ondown>
+				<visible>![VideoPlayer.HasTeletext] | ![Skin.HasSetting(Player_Show_Teletext_Button)]</visible>
 			</control>
+			<control type="button" id="918">
+				<description>Teletext Button</description>
+				<posx>138</posx>
+				<posy>15</posy>
+				<width>74</width>
+				<height>66</height>
+				<texturefocus>osd_button_lyricsFO.png</texturefocus>
+				<texturenofocus>osd_button_lyrics.png</texturenofocus>
+				<onclick>XBMC.ActivateWindow(Teletext)</onclick>
+				<label>-</label>
+				<font>-</font>
+				<onleft>208</onleft>
+				<onright>215</onright>
+				<onup>919</onup>
+				<ondown>921</ondown>
+				<visible>VideoPlayer.HasTeletext + Skin.HasSetting(Player_Show_Teletext_Button)</visible>
+			 </control>
 			<control type="togglebutton" id="921">
 				<description>Video Menu</description>
 				<posx>147</posx>
@@ -280,4 +307,4 @@
 			</control>
 		</control>
 	</controls>
-</window>
\ No newline at end of file
+</window>

Modified: trunk/skin/PM3.HD/720p/custom_SkinSetting_1111.xml
===================================================================
--- trunk/skin/PM3.HD/720p/custom_SkinSetting_1111.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/skin/PM3.HD/720p/custom_SkinSetting_1111.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -144,6 +144,24 @@
 					<texturenofocus>-</texturenofocus>
 					<enable>Skin.HasSetting(Use_Startup_Playlist)</enable>
 				</control>
+				<control type="image" id="112">
+					<width>950</width>
+					<height>2</height>
+					<texture>separator.png</texture>
+				</control>
+				<control type="radiobutton" id="113">
+					<width>950</width>
+					<height>35</height>
+					<font>font12</font>
+					<label>31115</label>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="7">list-focus.png</texturefocus>
+					<texturenofocus>-</texturenofocus>
+					<textureradiofocus>radiobutton-focus-2.png</textureradiofocus>
+					<onclick>Skin.ToggleSetting(Player_Show_Teletext_Button)</onclick>
+					<selected>Skin.HasSetting(Player_Show_Teletext_Button)</selected>
+				</control>
 			</control>
 			<control type="grouplist" id="9002">
 				<visible>Skin.String(SkinSettings,2)</visible>

Modified: trunk/skin/PM3.HD/language/English/strings.xml
===================================================================
--- trunk/skin/PM3.HD/language/English/strings.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/skin/PM3.HD/language/English/strings.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -80,6 +80,7 @@
   <string id="31112">Show media titles in "Wide icons" view</string>
   <string id="31113">Single Image</string>
   <string id="31114">Multi Image</string>
+  <string id="31115">Replace Audio Settings Button with Teletext</string>
 
   <!-- Script Settings labels -->
   <string id="31200">Custom script options</string>

Modified: trunk/skin/PM3.HD/language/German/strings.xml
===================================================================
--- trunk/skin/PM3.HD/language/German/strings.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/skin/PM3.HD/language/German/strings.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -82,6 +82,7 @@
   <string id="31109">Home Screen Hintergr\xFCnde</string>
   <string id="31110">button - Aktiviere eigene Hintergr\xFCnde</string>
   <string id="31111">Immer Musik Infos anzeigen w\xE4hrend der Liedtexte</string>
+  <string id="31115">Ersetzte Taste f\xFCr Audio Einstellungen mit Videotext</string>
 
   <!-- Script Settings labels -->
   <string id="31200">Eigene Script Optionen</string>

Modified: trunk/system/Lircmap.xml
===================================================================
--- trunk/system/Lircmap.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/system/Lircmap.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -48,10 +48,10 @@
 		<eight>Eight</eight>
 		<nine>Nine</nine>
 		<zero>Zero</zero>
-		<mytv>Red</mytv>
-		<mymusic>Green</mymusic>
-		<mypictures>Yellow</mypictures>
-		<myvideo>Blue</myvideo>
+		<red>Red</red>
+		<green>Green</green>
+		<yellow>Yellow</yellow>
+		<blue>Blue</blue>
 	</remote>
 	
 	<remote device="XboxDVDDongle">
@@ -183,9 +183,9 @@
 		<eight>8</eight>
 		<nine>9</nine>
 		<zero>0</zero>
-		<mytv>red</mytv>
-		<mymusic>green</mymusic>
-		<mypictures>yellow</mypictures>
-		<myvideo>blue</myvideo>
+		<red>red</red>
+		<green>green</green>
+		<yellow>yellow</yellow>
+		<blue>blue</blue>
 	</remote>
 </lircmap>

Modified: trunk/system/keymaps/keyboard.xml
===================================================================
--- trunk/system/keymaps/keyboard.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/system/keymaps/keyboard.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -163,6 +163,7 @@
       <down>BigStepBack</down>
       <a>AudioDelay</a>
       <escape>Fullscreen</escape>
+      <v>XBMC.ActivateWindow(Teletext)</v>
     </keyboard>
   </FullscreenVideo>
   <FullscreenInfo>
@@ -489,6 +490,13 @@
       <space>Pause</space>
     </keyboard>
   </PictureInfo>
+  <Teletext>
+    <keyboard>
+      <backspace>Close</backspace>
+      <escape>Close</escape>
+      <v>Close</v>
+    </keyboard>
+  </Teletext>
   <Favourites>
     <keyboard>
       <backspace>Close</backspace>

Modified: trunk/system/keymaps/remote.xml
===================================================================
--- trunk/system/keymaps/remote.xml	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/system/keymaps/remote.xml	2009-09-30 20:49:46 UTC (rev 23277)
@@ -67,6 +67,10 @@
       <mymusic>XBMC.ActivateWindow(MyMusic)</mymusic>
       <mypictures>XBMC.ActivateWindow(MyPictures)</mypictures>
       <mytv>XBMC.ActivateWindow(Home)</mytv>
+      <red>XBMC.ActivateWindow(Home)</red>
+      <green>XBMC.ActivateWindow(MyVideos)</green>
+      <yellow>XBMC.ActivateWindow(MyMusic)</yellow>
+      <blue>XBMC.ActivateWindow(MyPictures)</blue>
       <zero>Number0</zero>
       <one>Number1</one>
       <two>JumpSMS2</two>
@@ -138,6 +142,7 @@
       <info>Info</info>
       <enter>AspectRatio</enter>
       <select>AspectRatio</select>
+      <teletext>XBMC.ActivateWindow(Teletext)</teletext>
     </remote>
   </FullscreenVideo>
   <FullscreenInfo>
@@ -445,6 +450,29 @@
       <back>Close</back>
     </remote>
   </PictureInfo>
+  <Teletext>
+    <remote>
+      <zero>number0</zero>
+      <one>number1</one>
+      <two>number2</two>
+      <three>number3</three>
+      <four>number4</four>
+      <five>number5</five>
+      <six>number6</six>
+      <seven>number7</seven>
+      <eight>number8</eight>
+      <nine>number9</nine>
+      <red>Red</red>
+      <green>Green</green>
+      <yellow>Yellow</yellow>
+      <blue>Blue</blue>
+      <info>Info</info>
+      <back>Close</back>
+      <menu>Close</menu>
+      <start>Close</start>
+      <teletext>Close</teletext>
+    </remote>
+  </Teletext>
   <Favourites>
     <remote>
       <back>Close</back>

Modified: trunk/xbmc/Application.cpp
===================================================================
--- trunk/xbmc/Application.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/Application.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -210,6 +210,7 @@
 #include "GUIDialogAccessPoints.h"
 #endif
 #include "GUIDialogFullScreenInfo.h"
+#include "GUIDialogTeletext.h"
 #include "GUIDialogSlider.h"
 #include "cores/dlgcache.h"
 
@@ -1149,6 +1150,7 @@
 #ifdef HAS_DX
   m_gWindowManager.Add(new CGUIWindowTestPatternDX);      // window id = 8
 #endif
+  m_gWindowManager.Add(new CGUIDialogTeletext);               // window id =
   m_gWindowManager.Add(new CGUIWindowSettingsScreenCalibration); // window id = 11
   m_gWindowManager.Add(new CGUIWindowSettingsCategory);         // window id = 12 slideshow:window id 2007
   m_gWindowManager.Add(new CGUIWindowScripts);                  // window id = 20
@@ -3325,6 +3327,8 @@
     m_gWindowManager.Delete(WINDOW_DIALOG_ACCESS_POINTS);
     m_gWindowManager.Delete(WINDOW_DIALOG_SLIDER);
 
+    m_gWindowManager.Delete(WINDOW_DIALOG_OSD_TELETEXT);
+
     m_gWindowManager.Delete(WINDOW_STARTUP);
     m_gWindowManager.Delete(WINDOW_LOGIN_SCREEN);
     m_gWindowManager.Delete(WINDOW_VISUALISATION);

Modified: trunk/xbmc/ButtonTranslator.cpp
===================================================================
--- trunk/xbmc/ButtonTranslator.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/ButtonTranslator.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -44,7 +44,7 @@
   int action;
 } ActionMapping;
 
-static const ActionMapping actions[] = 
+static const ActionMapping actions[] =
        {{"left"              , ACTION_MOVE_LEFT },
         {"right"             , ACTION_MOVE_RIGHT},
         {"up"                , ACTION_MOVE_UP   },
@@ -185,7 +185,11 @@
         {"filtersms9"        , ACTION_FILTER_SMS9},
         {"firstpage"         , ACTION_FIRST_PAGE},
         {"lastpage"          , ACTION_LAST_PAGE},
-        {"guiprofile"        , ACTION_GUIPROFILE_BEGIN}};
+        {"guiprofile"        , ACTION_GUIPROFILE_BEGIN},
+        {"red"               , ACTION_TELETEXT_RED},
+        {"green"             , ACTION_TELETEXT_GREEN},
+        {"yellow"            , ACTION_TELETEXT_YELLOW},
+        {"blue"              , ACTION_TELETEXT_BLUE}};
 
 CButtonTranslator& CButtonTranslator::GetInstance()
 {
@@ -821,7 +825,7 @@
 
   if (strAction.Equals("noop"))
     return true;
-  
+
   for (unsigned int index=0;index < sizeof(actions)/sizeof(actions[0]);++index)
   {
     if (strAction.Equals(actions[index].name))
@@ -880,6 +884,7 @@
   else if (strWindow.Equals("videolibrary")) windowID = WINDOW_VIDEO_NAV;
   else if (strWindow.Equals("videoplaylist")) windowID = WINDOW_VIDEO_PLAYLIST;
   else if (strWindow.Equals("systeminfo")) windowID = WINDOW_SYSTEM_INFORMATION;
+  else if (strWindow.Equals("teletext")) windowID = WINDOW_DIALOG_OSD_TELETEXT;
   else if (strWindow.Equals("guicalibration")) windowID = WINDOW_SCREEN_CALIBRATION;
   else if (strWindow.Equals("screencalibration")) windowID = WINDOW_SCREEN_CALIBRATION;
   else if (strWindow.Equals("testpattern")) windowID = WINDOW_TEST_PATTERN;
@@ -1047,6 +1052,11 @@
   else if (strButton.Equals("clear")) buttonCode = XINPUT_IR_REMOTE_CLEAR;
   else if (strButton.Equals("enter")) buttonCode = XINPUT_IR_REMOTE_SELECT;  // same as select
   else if (strButton.Equals("xbox")) buttonCode = XINPUT_IR_REMOTE_DISPLAY; // same as display
+  else if (strButton.Equals("teletext")) buttonCode = XINPUT_IR_REMOTE_TELETEXT;
+  else if (strButton.Equals("red")) buttonCode = XINPUT_IR_REMOTE_RED;
+  else if (strButton.Equals("green")) buttonCode = XINPUT_IR_REMOTE_GREEN;
+  else if (strButton.Equals("yellow")) buttonCode = XINPUT_IR_REMOTE_YELLOW;
+  else if (strButton.Equals("blue")) buttonCode = XINPUT_IR_REMOTE_BLUE;
   else CLog::Log(LOGERROR, "Remote Translator: Can't find button %s", strButton.c_str());
   return buttonCode;
 }

Added: trunk/xbmc/GUIDialogTeletext.cpp
===================================================================
--- trunk/xbmc/GUIDialogTeletext.cpp	                        (rev 0)
+++ trunk/xbmc/GUIDialogTeletext.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -0,0 +1,149 @@
+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "GUIDialogTeletext.h"
+#include "utils/log.h"
+#include "GUIWindowManager.h"
+#include "GUISettings.h"
+#include "Application.h"
+#include "GUITexture.h"
+#include "Texture.h"
+#include "Settings.h"
+
+using namespace std;
+
+static int teletextFadeAmount = 0;
+
+CGUIDialogTeletext::CGUIDialogTeletext()
+    : CGUIDialog(WINDOW_DIALOG_OSD_TELETEXT, "")
+{
+  m_isDialog    = false;
+  m_pTxtTexture = NULL;
+}
+
+CGUIDialogTeletext::~CGUIDialogTeletext()
+{
+}
+
+bool CGUIDialogTeletext::OnAction(const CAction& action)
+{
+  if (action.id == ACTION_PREVIOUS_MENU || action.id == ACTION_CLOSE_DIALOG)
+  {
+    m_bClose = true;
+    return true;
+  }
+
+  if (m_TextDecoder.HandleAction(action))
+    return true;
+
+  return CGUIDialog::OnAction(action);
+}
+
+bool CGUIDialogTeletext::OnMessage(CGUIMessage& message)
+{
+  if (message.GetMessage() == GUI_MSG_WINDOW_INIT)
+  {
+    /* Do not open if no teletext is available */
+    if (!g_application.m_pPlayer->GetTeletextCache())
+    {
+      Close();
+      return true;
+    }
+  }
+  return CGUIDialog::OnMessage(message);
+}
+
+void CGUIDialogTeletext::Render()
+{
+  // Do not render if we have no texture
+  if (!m_pTxtTexture)
+  {
+    CLog::Log(LOGERROR, "CGUITeletextBox::Render called without texture");
+    return;
+  }
+
+  m_TextDecoder.RenderPage();
+
+  if (!m_bClose)
+  {
+    if (teletextFadeAmount < 100)
+      teletextFadeAmount = std::min(100, teletextFadeAmount + 5);
+  }
+  else
+  {
+    if (teletextFadeAmount > 0)
+      teletextFadeAmount = std::max(0, teletextFadeAmount - 10);
+
+    if (teletextFadeAmount == 0)
+      Close();
+  }
+
+  unsigned char* textureBuffer = (unsigned char*)m_TextDecoder.GetTextureBuffer();
+  if (!m_bClose && m_TextDecoder.NeedRendering() && textureBuffer)
+  {
+    m_pTxtTexture->Update(m_TextDecoder.GetWidth(), m_TextDecoder.GetHeight(), m_TextDecoder.GetWidth()*4, XB_FMT_B8G8R8A8, textureBuffer, false);
+    m_TextDecoder.RenderingDone();
+  }
+
+  color_t color = ((color_t)(teletextFadeAmount * 2.55f) & 0xff) << 24 | 0xFFFFFF;
+  CGUITexture::DrawQuad(m_vertCoords, color, m_pTxtTexture);
+
+  CGUIDialog::Render();
+}
+
+void CGUIDialogTeletext::OnInitWindow()
+{
+  teletextFadeAmount  = 0;
+  m_bClose            = false;
+  m_windowLoaded      = true;
+
+  RESOLUTION res = g_graphicsContext.GetVideoResolution();
+  m_vertCoords.SetRect((float)g_settings.m_ResInfo[res].Overscan.left,
+                       (float)g_settings.m_ResInfo[res].Overscan.top,
+                       (float)g_settings.m_ResInfo[res].Overscan.right,
+                       (float)g_settings.m_ResInfo[res].Overscan.bottom);
+
+  if (!m_TextDecoder.InitDecoder())
+  {
+    CLog::Log(LOGERROR, "%s: failed to init teletext decoder", __FUNCTION__);
+    Close();
+  }
+
+  m_pTxtTexture = new CTexture(m_TextDecoder.GetWidth(), m_TextDecoder.GetHeight(), 32, XB_FMT_B8G8R8A8);
+  if (!m_pTxtTexture)
+  {
+    CLog::Log(LOGERROR, "%s: failed to create texture", __FUNCTION__);
+    Close();
+  }
+
+  CGUIDialog::OnInitWindow();
+}
+
+void CGUIDialogTeletext::OnDeinitWindow(int nextWindowID)
+{
+  m_windowLoaded = false;
+  m_TextDecoder.EndDecoder();
+
+  delete m_pTxtTexture;
+  m_pTxtTexture = NULL;
+
+  CGUIDialog::OnDeinitWindow(nextWindowID);
+}


Property changes on: trunk/xbmc/GUIDialogTeletext.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/xbmc/GUIDialogTeletext.h
===================================================================
--- trunk/xbmc/GUIDialogTeletext.h	                        (rev 0)
+++ trunk/xbmc/GUIDialogTeletext.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -0,0 +1,44 @@
+#pragma once
+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "GUIDialog.h"
+#include "utils/Teletext.h"
+
+class CBaseTexture;
+
+class CGUIDialogTeletext : public CGUIDialog
+{
+public:
+  CGUIDialogTeletext(void);
+  virtual ~CGUIDialogTeletext(void);
+  virtual bool OnMessage(CGUIMessage& message);
+  virtual bool OnAction(const CAction& action);
+  virtual void Render();
+  virtual void OnInitWindow();
+  virtual void OnDeinitWindow(int nextWindowID);
+
+protected:
+  bool                m_bClose;           /* Close sendet, needed for fade out */
+  CBaseTexture*       m_pTxtTexture;      /* Texture info class to render to screen */
+  CRect               m_vertCoords;       /* Coordinates of teletext field on screen */
+  CTeletextDecoder    m_TextDecoder;      /* Decoding class for teletext code */
+};


Property changes on: trunk/xbmc/GUIDialogTeletext.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/xbmc/GUISettings.cpp
===================================================================
--- trunk/xbmc/GUISettings.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/GUISettings.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -484,6 +484,9 @@
   AddFloat(21, "videoplayer.maxspeedadjust", 13504, 5.0f, 0.0f, 0.1f, 10.0f);
   AddInt(22, "videoplayer.resamplequality", 13505, RESAMPLE_MID, RESAMPLE_LOW, 1, RESAMPLE_REALLYHIGH, SPIN_CONTROL_TEXT);
 
+  AddSeparator(23, "videoplayer.sep5");
+  AddBool(24, "videoplayer.teletextenabled", 23050, true);
+
   AddCategory(5, "subtitles", 287);
   AddString(1, "subtitles.font", 288, "arial.ttf", SPIN_CONTROL_TEXT);
   AddInt(2, "subtitles.height", 289, 28, 16, 2, 74, SPIN_CONTROL_TEXT); // use text as there is a disk based lookup needed

Modified: trunk/xbmc/GUIWindowFullScreen.cpp
===================================================================
--- trunk/xbmc/GUIWindowFullScreen.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/GUIWindowFullScreen.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -502,9 +502,11 @@
     {
       CGUIWindow::OnMessage(message);
 
+      CGUIDialog *pDialog = (CGUIDialog *)m_gWindowManager.GetWindow(WINDOW_DIALOG_OSD_TELETEXT);
+      if (pDialog) pDialog->Close(true);
       CGUIDialogSlider *slider = (CGUIDialogSlider *)m_gWindowManager.GetWindow(WINDOW_DIALOG_SLIDER);
       if (slider) slider->Close(true);
-      CGUIDialog *pDialog = (CGUIDialog *)m_gWindowManager.GetWindow(WINDOW_OSD);
+      pDialog = (CGUIDialog *)m_gWindowManager.GetWindow(WINDOW_OSD);
       if (pDialog) pDialog->Close(true);
       pDialog = (CGUIDialog *)m_gWindowManager.GetWindow(WINDOW_DIALOG_FULLSCREEN_INFO);
       if (pDialog) pDialog->Close(true);

Modified: trunk/xbmc/GUIWindowOSD.cpp
===================================================================
--- trunk/xbmc/GUIWindowOSD.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/GUIWindowOSD.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -47,7 +47,8 @@
     // check for movement of mouse or a submenu open
     if (g_Mouse.HasMoved() || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_AUDIO_OSD_SETTINGS)
                            || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_VIDEO_OSD_SETTINGS)
-                           || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_VIDEO_BOOKMARKS))
+                           || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_VIDEO_BOOKMARKS)
+                           || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_OSD_TELETEXT))
       SetAutoClose(3000);
   }
   CGUIDialog::Render();
@@ -108,6 +109,8 @@
       if (pDialog && pDialog->IsDialogRunning()) pDialog->Close(true);
       pDialog = (CGUIDialog *)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_BOOKMARKS);
       if (pDialog && pDialog->IsDialogRunning()) pDialog->Close(true);
+      pDialog = (CGUIDialog *)m_gWindowManager.GetWindow(WINDOW_DIALOG_OSD_TELETEXT);
+      if (pDialog && pDialog->IsDialogRunning()) pDialog->Close(true);
     }
     break;
   }

Modified: trunk/xbmc/Makefile
===================================================================
--- trunk/xbmc/Makefile	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/Makefile	2009-09-30 20:49:46 UTC (rev 23277)
@@ -1,4 +1,4 @@
-INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem
+INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2
 
 INCLUDES+=-Ilib/libUPnP/Platinum/ThirdParty/Neptune/Source/Core \
           -Ilib/libUPnP/Platinum/Source/Core \
@@ -133,6 +133,7 @@
      GUIDialogSelect.cpp \
      GUIDialogSettings.cpp \
      GUIDialogSubMenu.cpp \
+     GUIDialogTeletext.cpp \
      GUIDialogVideoBookmarks.cpp \
      GUIDialogVideoSettings.cpp \
      GUIDialogVisualisationPresetList.cpp \

Modified: trunk/xbmc/XBIRRemote.h
===================================================================
--- trunk/xbmc/XBIRRemote.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/XBIRRemote.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -58,6 +58,13 @@
 #define XINPUT_IR_REMOTE_HASH           41
 #define XINPUT_IR_REMOTE_CLEAR          249
 
+// additional keys not defined by xbox remotes but present on generic remotes
+#define XINPUT_IR_REMOTE_TELETEXT       250
+#define XINPUT_IR_REMOTE_RED            251
+#define XINPUT_IR_REMOTE_GREEN          252
+#define XINPUT_IR_REMOTE_YELLOW         253
+#define XINPUT_IR_REMOTE_BLUE           254
+
 typedef struct _XINPUT_IR_REMOTE
 {
   BYTE wButtons;

Modified: trunk/xbmc/cores/IPlayer.h
===================================================================
--- trunk/xbmc/cores/IPlayer.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/IPlayer.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -24,6 +24,7 @@
 #include "IAudioCallback.h"
 #include "Key.h"
 
+struct TextCacheStruct_t;
 class TiXmlElement;
 class CStreamDetails;
 
@@ -68,7 +69,7 @@
   virtual bool QueueNextFile(const CFileItem &file) { return false; }
   virtual void OnNothingToQueueNotify() {}
   virtual bool CloseFile(){ return true;}
-  virtual bool IsPlaying() const { return false;} 
+  virtual bool IsPlaying() const { return false;}
   virtual void Pause() = 0;
   virtual bool IsPaused() const = 0;
   virtual bool HasVideo() const = 0;
@@ -110,6 +111,9 @@
   virtual void GetAudioStreamName(int iStream, CStdString &strStreamName){};
   virtual void SetAudioStream(int iStream){};
 
+  virtual TextCacheStruct_t* GetTeletextCache() { return NULL; };
+  virtual void LoadPage(int p, int sp, unsigned char* buffer) {};
+
   virtual int  GetChapterCount()                               { return 0; }
   virtual int  GetChapter()                                    { return -1; }
   virtual void GetChapterName(CStdString& strChapterName)      { return; }
@@ -138,7 +142,7 @@
   //Returns true if not playback (paused or stopped beeing filled)
   virtual bool IsCaching() const {return false;};
   //Cache filled in Percent
-  virtual int GetCacheLevel() const {return -1;}; 
+  virtual int GetCacheLevel() const {return -1;};
 
   virtual bool IsInMenu() const {return false;};
   virtual bool HasMenu() { return false; };
@@ -151,6 +155,8 @@
   virtual CStdString GetPlayerState() { return ""; };
   virtual bool SetPlayerState(CStdString state) { return false;};
   
+  virtual CStdString GetPlayingTitle() { return ""; };
+
 protected:
   IPlayerCallback& m_callback;
 };

Modified: trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h
===================================================================
--- trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/avcodec.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -329,6 +329,11 @@
     CODEC_ID_SSA,
     CODEC_ID_MOV_TEXT,
 
+    /* data codecs */
+    CODEC_ID_VBI_DATA= 0x17500,
+    CODEC_ID_VBI_TELETEXT,
+    CODEC_ID_EBU_TELETEXT,
+
     /* other specific kind of codecs (generally used for attachments) */
     CODEC_ID_TTF= 0x18000,
 

Modified: trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
===================================================================
--- trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c	2009-09-30 20:49:46 UTC (rev 23277)
@@ -542,7 +542,9 @@
     { 0x7a, CODEC_TYPE_AUDIO,            CODEC_ID_EAC3 }, /* E-AC-3 descriptor */
     { 0x7b, CODEC_TYPE_AUDIO,             CODEC_ID_DTS },
     { 0x59, CODEC_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */
-    { 0x56, CODEC_TYPE_DATA,             CODEC_ID_NONE }, /* VBI descriptor */
+    { 0x45, CODEC_TYPE_DATA,         CODEC_ID_VBI_DATA }, /* VBI Data descriptor */
+    { 0x46, CODEC_TYPE_DATA,     CODEC_ID_VBI_TELETEXT }, /* VBI Teletext descriptor */
+    { 0x56, CODEC_TYPE_DATA,     CODEC_ID_EBU_TELETEXT }, /* EBU Teletext descriptor */
     { 0 },
 };
 

Modified: trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -23,6 +23,11 @@
 #include "DVDCodecs/DVDCodecs.h"
 #include "../../../LangCodeExpander.h"
 
+void CDemuxStreamTeletext::GetStreamInfo(std::string& strInfo)
+{
+  strInfo = "Teletext Data Stream";
+}
+
 void CDemuxStreamAudio::GetStreamType(std::string& strInfo)
 {
   char sInfo[64];
@@ -83,6 +88,19 @@
   return iCounter;
 }
 
+int CDVDDemux::GetNrOfTeletextStreams()
+{
+  int iCounter = 0;
+
+  for (int i = 0; i < GetNrOfStreams(); i++)
+  {
+    CDemuxStream* pStream = GetStream(i);
+    if (pStream->type == STREAM_TELETEXT) iCounter++;
+  }
+
+  return iCounter;
+}
+
 CDemuxStreamAudio* CDVDDemux::GetStreamFromAudioId(int iAudioIndex)
 {
   int counter = -1;
@@ -125,6 +143,20 @@
   return NULL;
 }
 
+CDemuxStreamTeletext* CDVDDemux::GetStreamFromTeletextId(int iTeletextIndex)
+{
+  int counter = -1;
+  for (int i = 0; i < GetNrOfStreams(); i++)
+  {
+    CDemuxStream* pStream = GetStream(i);
+
+    if (pStream->type == STREAM_TELETEXT) counter++;
+    if (iTeletextIndex == counter)
+      return (CDemuxStreamTeletext*)pStream;
+  }
+  return NULL;
+}
+
 void CDemuxStream::GetStreamName( std::string& strInfo )
 {
   if( language[0] == 0 )

Modified: trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -52,7 +52,8 @@
   STREAM_AUDIO,   // audio stream
   STREAM_VIDEO,   // video stream
   STREAM_DATA,    // data stream
-  STREAM_SUBTITLE // subtitle stream
+  STREAM_SUBTITLE,// subtitle stream
+  STREAM_TELETEXT // Teletext data stream
 };
 
 enum StreamSource {
@@ -175,6 +176,16 @@
   int identifier;
 };
 
+class CDemuxStreamTeletext : public CDemuxStream
+{
+public:
+  CDemuxStreamTeletext() : CDemuxStream()
+  {
+    type = STREAM_TELETEXT;
+  }
+  virtual void GetStreamInfo(std::string& strInfo);
+};
+
 typedef struct DemuxPacket
 {
   BYTE* pData;   // data
@@ -285,6 +296,11 @@
   int GetNrOfSubtitleStreams();
 
   /*
+   * return nr of teletext streams, 0 if none
+   */
+  int GetNrOfTeletextStreams();
+
+  /*
    * return the audio stream, or NULL if it does not exist
    */
   CDemuxStreamAudio* GetStreamFromAudioId(int iAudioIndex);
@@ -300,6 +316,11 @@
   CDemuxStreamSubtitle* GetStreamFromSubtitleId(int iSubtitleIndex);
 
   /*
+   * return the teletext stream, or NULL if it does not exist
+   */
+  CDemuxStreamTeletext* GetStreamFromTeletextId(int iTeletextIndex);
+
+  /*
    * return a user-presentable codec name of the given stream
    */
   virtual void GetStreamCodecName(int iStreamId, CStdString &strName) {};

Modified: trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -42,6 +42,7 @@
 #include "DVDClock.h" // for DVD_TIME_BASE
 #include "utils/Win32Exception.h"
 #include "AdvancedSettings.h"
+#include "GUISettings.h"
 #include "FileSystem/File.h"
 #include "utils/log.h"
 #include "Thread.h"
@@ -998,9 +999,21 @@
       }
     case CODEC_TYPE_DATA:
       {
-        m_streams[iId] = new CDemuxStream();
-        m_streams[iId]->type = STREAM_DATA;
-        break;
+#if (! defined USE_EXTERNAL_FFMPEG)
+        if (pStream->codec->codec_id == CODEC_ID_EBU_TELETEXT && g_guiSettings.GetBool("videoplayer.teletextenabled"))
+        {
+          CDemuxStreamTeletext* st = new CDemuxStreamTeletext();
+          m_streams[iId] = st;
+          m_streams[iId]->type = STREAM_TELETEXT;
+          break;
+        }
+        else
+#endif
+        {
+          m_streams[iId] = new CDemuxStream();
+          m_streams[iId]->type = STREAM_DATA;
+          break;
+        }
       }
     case CODEC_TYPE_SUBTITLE:
       {

Modified: trunk/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -224,7 +224,7 @@
         m_iDataSize -= pMsgDemuxerPacket->GetPacketSize();
         if(m_iDataSize == 0)
         {
-          if(!m_bEmptied)
+          if(!m_bEmptied && m_owner != "teletext") // Prevent log flooding
             CLog::Log(LOGWARNING, "CDVDMessageQueue(%s)::Get - retrieved last data packet of queue", m_owner.c_str());
           m_bEmptied = true;
         }

Modified: trunk/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDPlayer.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/DVDPlayer.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -143,6 +143,8 @@
     return IndexOf(type, p.m_CurrentVideo.source, p.m_CurrentVideo.id);
   else if(type == STREAM_SUBTITLE)
     return IndexOf(type, p.m_CurrentSubtitle.source, p.m_CurrentSubtitle.id);
+  else if(type == STREAM_TELETEXT)
+    return IndexOf(type, p.m_CurrentTeletext.source, p.m_CurrentTeletext.id);
 
   return -1;
 }
@@ -255,10 +257,12 @@
       m_CurrentAudio(STREAM_AUDIO),
       m_CurrentVideo(STREAM_VIDEO),
       m_CurrentSubtitle(STREAM_SUBTITLE),
+      m_CurrentTeletext(STREAM_TELETEXT),
       m_messenger("player"),
       m_dvdPlayerVideo(&m_clock, &m_overlayContainer, m_messenger),
       m_dvdPlayerAudio(&m_clock),
-      m_dvdPlayerSubtitle(&m_overlayContainer)
+      m_dvdPlayerSubtitle(&m_overlayContainer),
+      m_dvdPlayerTeletext()
 {
   m_pDemuxer = NULL;
   m_pSubtitleDemuxer = NULL;
@@ -399,6 +403,7 @@
   m_CurrentVideo.Clear();
   m_CurrentAudio.Clear();
   m_CurrentSubtitle.Clear();
+  m_CurrentTeletext.Clear();
 
   m_messenger.Init();
 
@@ -577,6 +582,17 @@
   else
     m_dvdPlayerVideo.EnableSubtitle(false);
 
+  // open teletext data stream
+  count = m_SelectionStreams.Count(STREAM_TELETEXT);
+  valid = false;
+  for(int i = 0;i<count && !valid;i++)
+  {
+    SelectionStream& s = m_SelectionStreams.Get(STREAM_TELETEXT, i);
+    if(OpenTeletextStream(s.id, s.source))
+      valid = true;
+  }
+  if(!valid)
+    CloseTeletextStream(true);
 }
 
 bool CDVDPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)
@@ -729,6 +745,9 @@
     if(current.type == STREAM_SUBTITLE)
       return false;
 
+    if(current.type == STREAM_TELETEXT)
+      return false;
+
     if(current.id < 0)
       return true;
   }
@@ -978,9 +997,12 @@
         m_dvdPlayerVideo.SendMessage   (new CDVDMsg(CDVDMsg::GENERAL_EOF));
       if(m_CurrentSubtitle.inited)
         m_dvdPlayerSubtitle.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
+      if(m_CurrentTeletext.inited)
+        m_dvdPlayerTeletext.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_EOF));
       m_CurrentAudio.inited    = false;
       m_CurrentVideo.inited    = false;
       m_CurrentSubtitle.inited = false;
+      m_CurrentTeletext.inited = false;
 
       // if we are caching, start playing it again
       if (m_caching && !m_bAbortRequest)
@@ -1018,6 +1040,7 @@
         if (!IsValidStream(m_CurrentAudio))    CloseAudioStream(true);
         if (!IsValidStream(m_CurrentVideo))    CloseVideoStream(true);
         if (!IsValidStream(m_CurrentSubtitle)) CloseSubtitleStream(true);
+        if (!IsValidStream(m_CurrentTeletext)) CloseTeletextStream(true);
       }
 
       // check if there is any better stream to use (normally for dvd's)
@@ -1026,6 +1049,7 @@
         // Do not reopen non-video streams if we're in video-only mode
         if (IsBetterStream(m_CurrentAudio,    pStream)) OpenAudioStream(pStream->iId, pStream->source);
         if (IsBetterStream(m_CurrentSubtitle, pStream)) OpenSubtitleStream(pStream->iId, pStream->source);
+        if (IsBetterStream(m_CurrentTeletext, pStream)) OpenTeletextStream(pStream->iId, pStream->source);
       }
 
       if (IsBetterStream(m_CurrentVideo,    pStream)) OpenVideoStream(pStream->iId, pStream->source);
@@ -1057,6 +1081,8 @@
         ProcessVideoData(pStream, pPacket);
       else if (pPacket->iStreamId == m_CurrentSubtitle.id && pStream->source == m_CurrentSubtitle.source && pStream->type == STREAM_SUBTITLE)
         ProcessSubData(pStream, pPacket);
+      else if (pPacket->iStreamId == m_CurrentTeletext.id && pStream->source == m_CurrentTeletext.source && pStream->type == STREAM_TELETEXT)
+        ProcessTeletextData(pStream, pPacket);
       else
       {
         pStream->SetDiscard(AVDISCARD_ALL);
@@ -1182,6 +1208,39 @@
     m_dvdPlayerSubtitle.UpdateOverlayInfo((CDVDInputStreamNavigator*)m_pInputStream, LIBDVDNAV_BUTTON_NORMAL);
 }
 
+void CDVDPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket)
+{
+  if (m_CurrentTeletext.stream != (void*)pStream)
+  {
+    /* check so that dmuxer hints or extra data hasn't changed */
+    /* if they have, reopen stream */
+
+    if (m_CurrentTeletext.hint != CDVDStreamInfo(*pStream, true))
+    {
+      // we don't actually have to close audiostream here first, as
+      // we could send it as a stream message. only problem
+      // is how to notify player if a stream change failed.
+      CloseTeletextStream( true );
+      OpenTeletextStream( pPacket->iStreamId, pStream->source );
+    }
+
+    m_CurrentTeletext.stream = (void*)pStream;
+  }
+  if(pPacket->dts != DVD_NOPTS_VALUE)
+    m_CurrentTeletext.dts = pPacket->dts;
+  else if(pPacket->pts != DVD_NOPTS_VALUE)
+    m_CurrentTeletext.dts = pPacket->pts;
+
+  bool drop = false;
+  if (CheckPlayerInit(m_CurrentTeletext, DVDPLAYER_TELETEXT))
+    drop = true;
+
+  if (CheckSceneSkip(m_CurrentTeletext))
+    drop = true;
+
+  m_dvdPlayerTeletext.SendMessage(new CDVDMsgDemuxerPacket(pPacket, drop));
+}
+
 void CDVDPlayer::HandlePlaySpeed()
 {
   if(GetPlaySpeed() != DVD_PLAYSPEED_NORMAL && GetPlaySpeed() != DVD_PLAYSPEED_PAUSE)
@@ -1252,6 +1311,8 @@
         m_CurrentVideo.startpts = current.dts;
       if(m_CurrentSubtitle.startpts != DVD_NOPTS_VALUE)
         m_CurrentSubtitle.startpts = current.dts;
+      if(m_CurrentTeletext.startpts != DVD_NOPTS_VALUE)
+        m_CurrentTeletext.startpts = current.dts;
     }
   }
 
@@ -1381,6 +1442,7 @@
     m_CurrentAudio.inited = false;
     m_CurrentVideo.inited = false;
     m_CurrentSubtitle.inited = false;
+    m_CurrentTeletext.inited = false;
   }
 
   /* stream jump forward */
@@ -1394,6 +1456,7 @@
     m_CurrentAudio.inited = false;
     m_CurrentVideo.inited = false;
     m_CurrentSubtitle.inited = false;
+    m_CurrentTeletext.inited = false;
   }
 
 }
@@ -1525,7 +1588,8 @@
   /* if we are awaiting a start sync, we can't sync here or we could deadlock */
   if(m_CurrentAudio.startsync
   || m_CurrentVideo.startsync
-  || m_CurrentSubtitle.startsync)
+  || m_CurrentSubtitle.startsync
+  || m_CurrentTeletext.startsync)
   {
     CLog::Log(LOGDEBUG, "%s - can't sync since we are already awaiting a sync", __FUNCTION__);
     return;
@@ -1571,6 +1635,8 @@
     m_dvdPlayerVideo.SendMessage(pMsg);
   if(target == DVDPLAYER_SUBTITLE)
     m_dvdPlayerSubtitle.SendMessage(pMsg);
+  if(target == DVDPLAYER_TELETEXT)
+    m_dvdPlayerTeletext.SendMessage(pMsg);
 }
 
 void CDVDPlayer::OnExit()
@@ -1613,6 +1679,11 @@
       CLog::Log(LOGNOTICE, "DVDPlayer: closing video stream");
       CloseSubtitleStream(!m_bAbortRequest);
     }
+    if (m_CurrentTeletext.id >= 0)
+    {
+      CLog::Log(LOGNOTICE, "DVDPlayer: closing teletext stream");
+      CloseTeletextStream(!m_bAbortRequest);
+    }
     // destroy the demuxer
     if (m_pDemuxer)
     {
@@ -2237,6 +2308,22 @@
   SyncronizeDemuxer(100);
 }
 
+TextCacheStruct_t* CDVDPlayer::GetTeletextCache()
+{
+  if (m_CurrentTeletext.id < 0)
+    return 0;
+
+  return m_dvdPlayerTeletext.GetTeletextCache();
+}
+
+void CDVDPlayer::LoadPage(int p, int sp, unsigned char* buffer)
+{
+  if (m_CurrentTeletext.id < 0)
+      return;
+
+  return m_dvdPlayerTeletext.LoadPage(p, sp, buffer);
+}
+
 void CDVDPlayer::SeekTime(__int64 iTime)
 {
   m_messenger.Put(new CDVDMsgPlayerSeek((int)iTime, true, true, true));
@@ -2489,6 +2576,52 @@
   return true;
 }
 
+bool CDVDPlayer::OpenTeletextStream(int iStream, int source)
+{
+  if (!m_pDemuxer)
+    return false;
+
+  CDemuxStream* pStream = m_pDemuxer->GetStream(iStream);
+  if(!pStream || pStream->disabled)
+    return false;
+
+  CDVDStreamInfo hint(*pStream, true);
+
+  if (!m_dvdPlayerTeletext.CheckStream(hint))
+    return false;
+
+  CLog::Log(LOGNOTICE, "Opening teletext stream: %i source: %i", iStream, source);
+
+  if(m_CurrentTeletext.id    < 0
+  || m_CurrentTeletext.hint != hint)
+  {
+    if(m_CurrentTeletext.id >= 0)
+    {
+      CLog::Log(LOGDEBUG, " - teletext codecs hints have changed, must close previous stream");
+      CloseTeletextStream(true);
+    }
+
+    if (!m_dvdPlayerTeletext.OpenStream(hint))
+    {
+      /* mark stream as disabled, to disallaw further attempts*/
+      CLog::Log(LOGWARNING, "%s - Unsupported teletext stream %d. Stream disabled.", __FUNCTION__, iStream);
+      pStream->disabled = true;
+      pStream->SetDiscard(AVDISCARD_ALL);
+      return false;
+    }
+  }
+  else
+    m_dvdPlayerTeletext.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_FLUSH));
+
+  /* store information about stream */
+  m_CurrentTeletext.id      = iStream;
+  m_CurrentTeletext.source  = source;
+  m_CurrentTeletext.hint    = hint;
+  m_CurrentTeletext.stream  = (void*)pStream;
+
+  return true;
+}
+
 bool CDVDPlayer::CloseAudioStream(bool bWaitForBuffers)
 {
   if (m_CurrentAudio.id < 0)
@@ -2528,6 +2661,19 @@
   return true;
 }
 
+bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers)
+{
+  if (m_CurrentTeletext.id < 0)
+    return false;
+
+  CLog::Log(LOGNOTICE, "Closing teletext stream");
+
+  m_dvdPlayerTeletext.CloseStream(bWaitForBuffers);
+
+  m_CurrentTeletext.Clear();
+  return true;
+}
+
 void CDVDPlayer::FlushBuffers(bool queued)
 {
   if(queued)
@@ -2536,6 +2682,7 @@
     m_dvdPlayerVideo.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_FLUSH));
     m_dvdPlayerVideo.SendMessage(new CDVDMsg(CDVDMsg::VIDEO_NOSKIP));
     m_dvdPlayerSubtitle.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_FLUSH));
+    m_dvdPlayerTeletext.SendMessage(new CDVDMsg(CDVDMsg::GENERAL_FLUSH));
     SyncronizePlayers(SYNCSOURCE_ALL);
   }
   else
@@ -2543,6 +2690,7 @@
     m_dvdPlayerAudio.Flush();
     m_dvdPlayerVideo.Flush();
     m_dvdPlayerSubtitle.Flush();
+    m_dvdPlayerTeletext.Flush();
 
     // clear subtitle and menu overlays
     m_overlayContainer.Clear();
@@ -2550,6 +2698,7 @@
   m_CurrentAudio.inited = false;
   m_CurrentVideo.inited = false;
   m_CurrentSubtitle.inited = false;
+  m_CurrentTeletext.inited = false;
 }
 
 // since we call ffmpeg functions to decode, this is being called in the same thread as ::Process() is
@@ -3266,6 +3415,16 @@
     return false;
 }
 
+CStdString CDVDPlayer::GetPlayingTitle()
+{
+  /* Currently we support only Title Name from Teletext line 30 */
+  TextCacheStruct_t* ttcache = m_dvdPlayerTeletext.GetTeletextCache();
+  if (ttcache && !ttcache->line30.empty())
+    return ttcache->line30;
+
+  return "";
+}
+
 CDVDPlayer::CPlayerSeek::CPlayerSeek(CDVDPlayer* player)
       : m_player(*player)
 {

Modified: trunk/xbmc/cores/dvdplayer/DVDPlayer.h
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDPlayer.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/DVDPlayer.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -31,6 +31,7 @@
 #include "DVDPlayerAudio.h"
 #include "DVDPlayerVideo.h"
 #include "DVDPlayerSubtitle.h"
+#include "DVDPlayerTeletext.h"
 
 //#include "DVDChapterReader.h"
 #include "DVDSubtitles/DVDFactorySubtitle.h"
@@ -127,6 +128,7 @@
 #define DVDPLAYER_AUDIO    1
 #define DVDPLAYER_VIDEO    2
 #define DVDPLAYER_SUBTITLE 3
+#define DVDPLAYER_TELETEXT 4
 
 class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
 {
@@ -178,6 +180,9 @@
   virtual void GetAudioStreamName(int iStream, CStdString &strStreamName);
   virtual void SetAudioStream(int iStream);
 
+  virtual TextCacheStruct_t* GetTeletextCache();
+  virtual void LoadPage(int p, int sp, unsigned char* buffer);
+
   virtual int  GetChapterCount();
   virtual int  GetChapter();
   virtual void GetChapterName(CStdString& strChapterName);
@@ -202,6 +207,8 @@
 
   virtual CStdString GetPlayerState();
   virtual bool SetPlayerState(CStdString state);
+  
+  virtual CStdString GetPlayingTitle();
 
   virtual bool IsCaching() const { return m_caching; }
   virtual int GetCacheLevel() const ;
@@ -219,14 +226,17 @@
   bool OpenAudioStream(int iStream, int source);
   bool OpenVideoStream(int iStream, int source);
   bool OpenSubtitleStream(int iStream, int source);
+  bool OpenTeletextStream(int iStream, int source);
   bool CloseAudioStream(bool bWaitForBuffers);
   bool CloseVideoStream(bool bWaitForBuffers);
   bool CloseSubtitleStream(bool bKeepOverlays);
+  bool CloseTeletextStream(bool bWaitForBuffers);
 
   void ProcessPacket(CDemuxStream* pStream, DemuxPacket* pPacket);
   void ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket);
   void ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket);
   void ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket);
+  void ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket);
 
   bool AddSubtitleFile(const std::string& filename);
   /**
@@ -275,6 +285,7 @@
   CCurrentStream m_CurrentAudio;
   CCurrentStream m_CurrentVideo;
   CCurrentStream m_CurrentSubtitle;
+  CCurrentStream m_CurrentTeletext;
 
   CSelectionStreams m_SelectionStreams;
 
@@ -293,6 +304,7 @@
   CDVDPlayerVideo m_dvdPlayerVideo; // video part
   CDVDPlayerAudio m_dvdPlayerAudio; // audio part
   CDVDPlayerSubtitle m_dvdPlayerSubtitle; // subtitle part
+  CDVDTeletextData m_dvdPlayerTeletext; // teletext part
 
   CDVDClock m_clock;                // master clock
   CDVDOverlayContainer m_overlayContainer;

Added: trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp	                        (rev 0)
+++ trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -0,0 +1,781 @@
+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "Settings.h"
+#include "DVDPlayer.h"
+#include "DVDStreamInfo.h"
+#include "DVDPlayerTeletext.h"
+#include "Application.h"
+#include "DVDCodecs/DVDCodecs.h"
+#include "utils/log.h"
+
+using namespace std;
+
+const uint8_t rev_lut[32] =
+{
+  0x00,0x08,0x04,0x0c, /*  upper nibble */
+  0x02,0x0a,0x06,0x0e,
+  0x01,0x09,0x05,0x0d,
+  0x03,0x0b,0x07,0x0f,
+  0x00,0x80,0x40,0xc0, /*  lower nibble */
+  0x20,0xa0,0x60,0xe0,
+  0x10,0x90,0x50,0xd0,
+  0x30,0xb0,0x70,0xf0
+};
+
+void CDVDTeletextTools::NextDec(int *i) /* skip to next decimal */
+{
+  (*i)++;
+
+  if ((*i & 0x0F) > 0x09)
+    *i += 0x06;
+
+  if ((*i & 0xF0) > 0x90)
+    *i += 0x60;
+
+  if (*i > 0x899)
+    *i = 0x100;
+}
+
+void CDVDTeletextTools::PrevDec(int *i)           /* counting down */
+{
+  (*i)--;
+
+  if ((*i & 0x0F) > 0x09)
+    *i -= 0x06;
+
+  if ((*i & 0xF0) > 0x90)
+    *i -= 0x60;
+
+  if (*i < 0x100)
+    *i = 0x899;
+}
+
+/* print hex-number into string, s points to last digit, caller has to provide enough space, no termination */
+void CDVDTeletextTools::Hex2Str(char *s, unsigned int n)
+{
+  do {
+    char c = (n & 0xF);
+    *s-- = number2char(c);
+    n >>= 4;
+  } while (n);
+}
+
+signed int CDVDTeletextTools::deh24(unsigned char *p)
+{
+  int e = hamm24par[0][p[0]]
+    ^ hamm24par[1][p[1]]
+    ^ hamm24par[2][p[2]];
+
+  int x = hamm24val[p[0]]
+    + (p[1] & 127) * 16
+    + (p[2] & 127) * 2048;
+
+  return (x ^ hamm24cor[e]) | hamm24err[e];
+}
+
+
+CDVDTeletextData::CDVDTeletextData()
+: CThread()
+, m_messageQueue("teletext")
+{
+  m_speed = DVD_PLAYSPEED_NORMAL;
+
+  m_messageQueue.SetMaxDataSize(40 * 256 * 1024);
+
+  /* Initialize Data structures */
+  memset(&m_TXTCache.astCachetable, 0,    sizeof(m_TXTCache.astCachetable));
+  memset(&m_TXTCache.astP29,        0,    sizeof(m_TXTCache.astP29));
+  ResetTeletextCache();
+}
+
+CDVDTeletextData::~CDVDTeletextData()
+{
+  StopThread();
+  ResetTeletextCache();
+}
+
+bool CDVDTeletextData::CheckStream(CDVDStreamInfo &hints)
+{
+#if (! defined USE_EXTERNAL_FFMPEG)
+  if (hints.codec == CODEC_ID_EBU_TELETEXT)
+    return true;
+#endif
+
+  return false;
+}
+
+bool CDVDTeletextData::OpenStream(CDVDStreamInfo &hints)
+{
+  m_messageQueue.Init();
+
+#if (! defined USE_EXTERNAL_FFMPEG)
+  if (hints.codec == CODEC_ID_EBU_TELETEXT)
+  {
+    CLog::Log(LOGNOTICE, "Creating teletext data thread");
+    Create();
+    return true;
+  }
+#endif
+
+  return false;
+}
+
+void CDVDTeletextData::CloseStream(bool bWaitForBuffers)
+{
+  // wait until buffers are empty
+  if (bWaitForBuffers && m_speed > 0) m_messageQueue.WaitUntilEmpty();
+
+  m_messageQueue.Abort();
+
+  // wait for decode_video thread to end
+  CLog::Log(LOGNOTICE, "waiting for teletext data thread to exit");
+
+  StopThread(); // will set this->m_bStop to true
+
+  m_messageQueue.End();
+  ResetTeletextCache();
+}
+
+
+void CDVDTeletextData::ResetTeletextCache()
+{
+  CSingleLock lock(m_critSection);
+
+  /* Reset Data structures */
+  for (int i = 0; i < 0x900; i++)
+  {
+    for (int j = 0; j < 0x80; j++)
+    {
+      if (m_TXTCache.astCachetable[i][j])
+      {
+        TextPageinfo_t *p = &(m_TXTCache.astCachetable[i][j]->pageinfo);
+        if (p->p24)
+          free(p->p24);
+
+        if (p->ext)
+        {
+          if (p->ext->p27)
+            free(p->ext->p27);
+
+          for (int d26 = 0; d26 < 16; d26++)
+          {
+            if (p->ext->p26[d26])
+              free(p->ext->p26[d26]);
+          }
+          free(p->ext);
+        }
+        delete m_TXTCache.astCachetable[i][j];
+        m_TXTCache.astCachetable[i][j] = 0;
+      }
+    }
+  }
+
+  for (int i = 0; i < 9; i++)
+  {
+    if (m_TXTCache.astP29[i])
+    {
+      if (m_TXTCache.astP29[i]->p27)
+        free(m_TXTCache.astP29[i]->p27);
+
+      for (int d26 = 0; d26 < 16; d26++)
+      {
+        if (m_TXTCache.astP29[i]->p26[d26])
+          free(m_TXTCache.astP29[i]->p26[d26]);
+      }
+      free(m_TXTCache.astP29[i]);
+      m_TXTCache.astP29[i] = 0;
+    }
+    m_TXTCache.CurrentPage[i]    = -1;
+    m_TXTCache.CurrentSubPage[i] = -1;
+  }
+
+  memset(&m_TXTCache.SubPageTable,  0xFF, sizeof(m_TXTCache.SubPageTable));
+  memset(&m_TXTCache.astP29,        0,    sizeof(m_TXTCache.astP29));
+  memset(&m_TXTCache.BasicTop,      0,    sizeof(m_TXTCache.BasicTop));
+  memset(&m_TXTCache.ADIPTable,     0,    sizeof(m_TXTCache.ADIPTable));
+  memset(&m_TXTCache.FlofPages,     0,    sizeof(m_TXTCache.FlofPages));
+  memset(&m_TXTCache.SubtitlePages, 0,    sizeof(m_TXTCache.SubtitlePages));
+  memset(&m_TXTCache.astCachetable, 0,    sizeof(m_TXTCache.astCachetable));
+  memset(&m_TXTCache.TimeString,    0x20, 8);
+
+  m_TXTCache.NationalSubset           = NAT_DEFAULT;/* default */
+  m_TXTCache.NationalSubsetSecondary  = NAT_DEFAULT;
+  m_TXTCache.ZapSubpageManual         = false;
+  m_TXTCache.PageUpdate               = false;
+  m_TXTCache.ADIP_PgMax               = -1;
+  m_TXTCache.BTTok                    = false;
+  m_TXTCache.CachedPages              = 0;
+  m_TXTCache.PageReceiving            = -1;
+  m_TXTCache.Page                     = 0x100;
+  m_TXTCache.SubPage                  = m_TXTCache.SubPageTable[m_TXTCache.Page];
+  m_TXTCache.line30                   = "";
+  if (m_TXTCache.SubPage == 0xff)
+    m_TXTCache.SubPage = 0;
+}
+
+void CDVDTeletextData::OnStartup()
+{
+  CThread::SetName("CDVDTeletextData");
+}
+
+void CDVDTeletextData::Process()
+{
+  int             b1, b2, b3, b4;
+  int             packet_number;
+  TextPageinfo_t *pageinfo_thread;
+  unsigned char   vtxt_row[42];
+  unsigned char   pagedata[9][23*40];
+  unsigned char   magazine  = 0xff;
+  int             doupdate  = 0;
+
+  CLog::Log(LOGNOTICE, "running thread: CDVDTeletextData");
+
+  while (!m_bStop)
+  {
+    CDVDMsg* pMsg;
+    int iPriority = (m_speed == DVD_PLAYSPEED_PAUSE) ? 1 : 0;
+    MsgQueueReturnCode ret = m_messageQueue.Get(&pMsg, 2000, iPriority);
+
+    if (ret == MSGQ_TIMEOUT)
+    {
+      /* Timeout for Teletext is not a bad thing, so we continue without error */
+      continue;
+    }
+
+    if (MSGQ_IS_ERROR(ret) || ret == MSGQ_ABORT)
+    {
+      CLog::Log(LOGERROR, "Got MSGQ_ABORT or MSGO_IS_ERROR return true (%i)", ret);
+      break;
+    }
+
+    if (pMsg->IsType(CDVDMsg::DEMUXER_PACKET))
+    {
+      CSingleLock lock(m_critSection);
+
+      DemuxPacket* pPacket = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacket();
+      bool bPacketDrop     = ((CDVDMsgDemuxerPacket*)pMsg)->GetPacketDrop();
+      uint8_t *Datai       = pPacket->pData;
+      int rows             = (pPacket->iSize - 1) / 46;
+
+      /* Is it a ITU-R System B Teletext stream in acc. to EN 300 472 */
+      if (Datai[0] >= 0x10 && Datai[0] <= 0x1F) /* Check we have a valid data identifier */
+      {
+        /* Go thru the pages stored inside this frame */
+        for (int row=0; row < rows; row++)
+        {
+          uint8_t *vtx_rowbyte  = &Datai[(row*46)+1];
+          int      err          = 0;
+
+          /* Check for valid data_unit_id */
+          if ((vtx_rowbyte[0] == 0x02 || vtx_rowbyte[0] == 0x03) && (vtx_rowbyte[1] == 0x2C))
+          {
+            /* clear rowbuffer */
+            /* convert row from lsb to msb (begin with magazin number) */
+            for (int i = 4; i < 46; i++)
+            {
+              uint8_t upper = (vtx_rowbyte[i] >> 4) & 0xf;
+              uint8_t lower = vtx_rowbyte[i] & 0xf;
+              vtxt_row[i-4] = (rev_lut[upper]) | (rev_lut[lower+16]);
+            }
+
+            /* get packet number */
+            b1 = dehamming[vtxt_row[0]];
+            b2 = dehamming[vtxt_row[1]];
+
+            if (b1 == 0xFF || b2 == 0xFF)
+              continue;
+
+            b1 &= 8;
+
+            /* get packet and magazine number */
+            packet_number = b1>>3 | b2<<1;
+            magazine      = dehamming[vtxt_row[0]] & 7;
+            if (!magazine) magazine = 8;
+
+            if (packet_number == 0 && m_TXTCache.CurrentPage[magazine] != -1 && m_TXTCache.CurrentSubPage[magazine] != -1)
+              SavePage(m_TXTCache.CurrentPage[magazine], m_TXTCache.CurrentSubPage[magazine], pagedata[magazine]);
+
+            /* analyze row */
+            if (packet_number == 0)
+            {
+              /* get pagenumber */
+              b2 = dehamming[vtxt_row[3]];
+              b3 = dehamming[vtxt_row[2]];
+
+              if (b2 == 0xFF || b3 == 0xFF)
+              {
+                m_TXTCache.CurrentPage[magazine] = m_TXTCache.PageReceiving = -1;
+                continue;
+              }
+
+              m_TXTCache.CurrentPage[magazine] = m_TXTCache.PageReceiving = magazine<<8 | b2<<4 | b3;
+
+              if (b2 == 0x0f && b3 == 0x0f)
+              {
+                m_TXTCache.CurrentSubPage[magazine] = -1; /* ?ff: ignore data transmissions */
+                continue;
+              }
+
+              /* get subpagenumber */
+              b1 = dehamming[vtxt_row[7]];
+              b2 = dehamming[vtxt_row[6]];
+              b3 = dehamming[vtxt_row[5]];
+              b4 = dehamming[vtxt_row[4]];
+
+              if (b1 == 0xFF || b2 == 0xFF || b3 == 0xFF || b4 == 0xFF)
+              {
+                m_TXTCache.CurrentSubPage[magazine] = -1;
+                continue;
+              }
+
+              b1 &= 3;
+              b3 &= 7;
+
+              if (IsDec(m_TXTCache.PageReceiving)) /* ignore other subpage bits for hex pages */
+                m_TXTCache.CurrentSubPage[magazine] = b3<<4 | b4;
+              else
+                m_TXTCache.CurrentSubPage[magazine] = b4; /* max 16 subpages for hex pages */
+
+              /* store current subpage for this page */
+              m_TXTCache.SubPageTable[m_TXTCache.CurrentPage[magazine]] = m_TXTCache.CurrentSubPage[magazine];
+
+              AllocateCache(magazine);
+              LoadPage(m_TXTCache.CurrentPage[magazine], m_TXTCache.CurrentSubPage[magazine], pagedata[magazine]);
+              pageinfo_thread = &(m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]]->pageinfo);
+              if (!pageinfo_thread)
+                continue;
+
+              if ((m_TXTCache.PageReceiving & 0xff) == 0xfe) /* ?fe: magazine organization table (MOT) */
+                pageinfo_thread->function = FUNC_MOT;
+
+              /* check controlbits */
+              if (dehamming[vtxt_row[5]] & 8)   /* C4 -> erase page */
+              {
+                memset(m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]]->data, ' ', 23*40);
+                memset(pagedata[magazine],' ', 23*40);
+              }
+              if (dehamming[vtxt_row[9]] & 8)   /* C8 -> update page */
+                doupdate = m_TXTCache.PageReceiving;
+
+              pageinfo_thread->boxed = !!(dehamming[vtxt_row[7]] & 0x0c);
+
+              /* get country control bits */
+              b1 = dehamming[vtxt_row[9]];
+              if (b1 != 0xFF)
+              {
+                pageinfo_thread->nationalvalid = 1;
+                pageinfo_thread->national = rev_lut[b1] & 0x07;
+              }
+
+              if (dehamming[vtxt_row[7]] & 0x08)// subtitle page
+              {
+                int i = 0, found = -1, use = -1;
+                for (; i < 8; i++)
+                {
+                  if (use == -1 && !m_TXTCache.SubtitlePages[i].page)
+                    use = i;
+                  else if (m_TXTCache.SubtitlePages[i].page == m_TXTCache.PageReceiving)
+                  {
+                    found = i;
+                    use = i;
+                    break;
+                  }
+                }
+                if (found == -1 && use != -1)
+                  m_TXTCache.SubtitlePages[use].page = m_TXTCache.PageReceiving;
+                if (use != -1)
+                  m_TXTCache.SubtitlePages[use].language = CountryConversionTable[pageinfo_thread->national];
+              }
+
+              /* check parity, copy line 0 to cache (start and end 8 bytes are not needed and used otherwise) */
+              unsigned char *p = m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]]->p0;
+              for (int i = 10; i < 42-8; i++)
+                *p++ = deparity[vtxt_row[i]];
+
+              if (!IsDec(m_TXTCache.PageReceiving))
+                continue; /* valid hex page number: just copy headline, ignore TimeString */
+
+              /* copy TimeString */
+              p = m_TXTCache.TimeString;
+              for (int i = 42-8; i < 42; i++)
+                *p++ = deparity[vtxt_row[i]];
+            }
+            else if (packet_number == 29 && dehamming[vtxt_row[2]]== 0) /* packet 29/0 replaces 28/0 for a whole magazine */
+            {
+              Decode_p2829(vtxt_row, &(m_TXTCache.astP29[magazine]));
+            }
+            else if (m_TXTCache.CurrentPage[magazine] != -1 && m_TXTCache.CurrentSubPage[magazine] != -1)
+              /* packet>0, 0 has been correctly received, buffer allocated */
+            {
+              pageinfo_thread = &(m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]]->pageinfo);
+              if (!pageinfo_thread)
+                continue;
+
+              /* pointer to current info struct */
+              if (packet_number <= 25)
+              {
+                unsigned char *p = NULL;
+                if (packet_number < 24)
+                {
+                  p = pagedata[magazine] + 40*(packet_number-1);
+                }
+                else
+                {
+                  if (!(pageinfo_thread->p24))
+                    pageinfo_thread->p24 = (unsigned char*) calloc(2, 40);
+                  if (pageinfo_thread->p24)
+                    p = pageinfo_thread->p24 + (packet_number - 24) * 40;
+                }
+                if (p)
+                {
+                  if (IsDec(m_TXTCache.CurrentPage[magazine]))
+                  {
+                    for (int i = 2; i < 42; i++)
+                    {
+                      *p++ = vtxt_row[i] & 0x7f; /* allow values with parity errors as some channels don't care :( */
+                    }
+                  }
+                  else if ((m_TXTCache.CurrentPage[magazine] & 0xff) == 0xfe)
+                  {
+                    for (int i = 2; i < 42; i++)
+                    {
+                      *p++ = dehamming[vtxt_row[i]]; /* decode hamming 8/4 */
+                    }
+                  }
+                  else /* other hex page: no parity check, just copy */
+                    memcpy(p, &vtxt_row[2], 40);
+                }
+              }
+              else if (packet_number == 27)
+              {
+                int descode = dehamming[vtxt_row[2]]; /* designation code (0..15) */
+                if (descode == 0xff)
+                  continue;
+
+                if (descode == 0) // reading FLOF-Pagelinks
+                {
+                  b1 = dehamming[vtxt_row[0]];
+                  if (b1 != 0xff)
+                  {
+                    b1 &= 7;
+
+                    for (int i = 0; i < FLOFSIZE; i++)
+                    {
+                      b2 = dehamming[vtxt_row[4+i*6]];
+                      b3 = dehamming[vtxt_row[3+i*6]];
+
+                      if (b2 != 0xff && b3 != 0xff)
+                      {
+                        b4 = ((b1 ^ (dehamming[vtxt_row[8+i*6]]>>1)) & 6) | ((b1 ^ (dehamming[vtxt_row[6+i*6]]>>3)) & 1);
+                        if (b4 == 0)
+                          b4 = 8;
+                        if (b2 <= 9 && b3 <= 9)
+                          m_TXTCache.FlofPages[m_TXTCache.CurrentPage[magazine] ][i] = b4<<8 | b2<<4 | b3;
+                      }
+                    }
+
+                    /* copy last 2 links to ADIPTable for TOP-Index */
+                    if (pageinfo_thread->p24) /* packet 24 received */
+                    {
+                      int a, a1, e=39, l=3;
+                      unsigned char *p = pageinfo_thread->p24;
+                      do
+                      {
+                        for (;
+                            l >= 2 && 0 == m_TXTCache.FlofPages[m_TXTCache.CurrentPage[magazine]][l];
+                            l--)
+                          ; /* find used linkindex */
+                        for (;
+                            e >= 1 && !isalnum(p[e]);
+                            e--)
+                          ; /* find end */
+                        for (a = a1 = e - 1;
+                            a >= 0 && p[a] >= ' ';
+                            a--) /* find start */
+                          if (p[a] > ' ')
+                          a1 = a; /* first non-space */
+                        if (a >= 0 && l >= 2)
+                        {
+                          strncpy(m_TXTCache.ADIPTable[m_TXTCache.FlofPages[m_TXTCache.CurrentPage[magazine]][l]], (const char*) &p[a1], 12);
+                          if (e-a1 < 11)
+                            m_TXTCache.ADIPTable[m_TXTCache.FlofPages[m_TXTCache.CurrentPage[magazine]][l]][e-a1+1] = '\0';
+                        }
+                        e = a - 1;
+                        l--;
+                      } while (l >= 2);
+                    }
+                  }
+                }
+                else if (descode == 4)  /* level 2.5 links (ignore level 3.5 links of /4 and /5) */
+                {
+                  int i;
+                  Textp27_t *p;
+
+                  if (!pageinfo_thread->ext)
+                    pageinfo_thread->ext = (TextExtData_t*) calloc(1, sizeof(TextExtData_t));
+                  if (!pageinfo_thread->ext)
+                    continue;
+                  if (!(pageinfo_thread->ext->p27))
+                    pageinfo_thread->ext->p27 = (Textp27_t*) calloc(4, sizeof(Textp27_t));
+                  if (!(pageinfo_thread->ext->p27))
+                    continue;
+                  p = pageinfo_thread->ext->p27;
+                  for (i = 0; i < 4; i++)
+                  {
+                    int d1 = CDVDTeletextTools::deh24(&vtxt_row[6*i + 3]);
+                    int d2 = CDVDTeletextTools::deh24(&vtxt_row[6*i + 6]);
+                    if (d1 < 0 || d2 < 0)
+                      continue;
+
+                    p->local = i & 0x01;
+                    p->drcs = !!(i & 0x02);
+                    p->l25 = !!(d1 & 0x04);
+                    p->l35 = !!(d1 & 0x08);
+                    p->page =
+                      (((d1 & 0x000003c0) >> 6) |
+                       ((d1 & 0x0003c000) >> (14-4)) |
+                       ((d1 & 0x00003800) >> (11-8))) ^
+                      (dehamming[vtxt_row[0]] << 8);
+                    if (p->page < 0x100)
+                      p->page += 0x800;
+                    p->subpage = d2 >> 2;
+                    if ((p->page & 0xff) == 0xff)
+                      p->page = 0;
+                    else if (p->page > 0x899)
+                    {
+                      // workaround for crash on RTL Shop ...
+                      // sorry.. i dont understand whats going wrong here :)
+                      continue;
+                    }
+                    else if (m_TXTCache.astCachetable[p->page][0])  /* link valid && linked page cached */
+                    {
+                      TextPageinfo_t *pageinfo_link = &(m_TXTCache.astCachetable[p->page][0]->pageinfo);
+                      if (p->local)
+                        pageinfo_link->function = p->drcs ? FUNC_DRCS : FUNC_POP;
+                      else
+                        pageinfo_link->function = p->drcs ? FUNC_GDRCS : FUNC_GPOP;
+                    }
+                    p++; /*  */
+                  }
+                }
+              }
+              else if (packet_number == 26)
+              {
+                int descode = dehamming[vtxt_row[2]]; /* designation code (0..15) */
+                if (descode == 0xff)
+                  continue;
+
+                if (!pageinfo_thread->ext)
+                  pageinfo_thread->ext = (TextExtData_t*) calloc(1, sizeof(TextExtData_t));
+                if (!pageinfo_thread->ext)
+                  continue;
+                if (!(pageinfo_thread->ext->p26[descode]))
+                  pageinfo_thread->ext->p26[descode] = (unsigned char*) malloc(13 * 3);
+                if (pageinfo_thread->ext->p26[descode])
+                  memcpy(pageinfo_thread->ext->p26[descode], &vtxt_row[3], 13 * 3);
+              }
+              else if (packet_number == 28)
+              {
+                int descode = dehamming[vtxt_row[2]]; /* designation code (0..15) */
+
+                if (descode == 0xff)
+                  continue;
+
+                if (descode != 2)
+                {
+                  int t1 = CDVDTeletextTools::deh24(&vtxt_row[7-4]);
+                  pageinfo_thread->function = t1 & 0x0f;
+                  if (!pageinfo_thread->nationalvalid)
+                  {
+                    pageinfo_thread->nationalvalid = 1;
+                    pageinfo_thread->national = (t1>>4) & 0x07;
+                  }
+                }
+
+                switch (descode) /* designation code */
+                {
+                  case 0: /* basic level 1 page */
+                    Decode_p2829(vtxt_row, &(pageinfo_thread->ext));
+                    break;
+                  case 1: /* G0/G1 designation for older decoders, level 3.5: DCLUT4/16, colors for multicolored bitmaps */
+                    break; /* ignore */
+                  case 2: /* page key */
+                    break; /* ignore */
+                  case 3: /* types of PTUs in DRCS */
+                    break; /* TODO */
+                  case 4: /* CLUTs 0/1, only level 3.5 */
+                    break; /* ignore */
+                  default:
+                    break; /* invalid, ignore */
+                } /* switch designation code */
+              }
+              else if (packet_number == 30)
+              {
+                m_TXTCache.line30 = "";
+                for (int i=26-4; i <= 45-4; i++) /* station ID */
+                  m_TXTCache.line30.append(1, deparity[vtxt_row[i]]);
+              }
+            }
+
+            /* set update flag */
+            if (m_TXTCache.CurrentPage[magazine] == m_TXTCache.Page && m_TXTCache.CurrentSubPage[magazine] != -1)
+            {
+              SavePage(m_TXTCache.CurrentPage[magazine], m_TXTCache.CurrentSubPage[magazine], pagedata[magazine]);
+              m_TXTCache.PageUpdate = true;
+              doupdate = 0;
+              if (!m_TXTCache.ZapSubpageManual)
+                m_TXTCache.SubPage = m_TXTCache.CurrentSubPage[magazine];
+            }
+          }
+        }
+      }
+    }
+    else if (pMsg->IsType(CDVDMsg::PLAYER_SETSPEED))
+    {
+      m_speed = static_cast<CDVDMsgInt*>(pMsg)->m_value;
+    }
+    else if (pMsg->IsType(CDVDMsg::GENERAL_FLUSH)) // private message sent by (CDVDTeletextData::Flush())
+    {
+      ResetTeletextCache();
+    }
+    pMsg->Release();
+  }
+}
+
+void CDVDTeletextData::OnExit()
+{
+  CLog::Log(LOGNOTICE, "thread end: data_thread");
+}
+
+void CDVDTeletextData::Flush()
+{
+  /* flush using message as this get's called from dvdplayer thread */
+  /* and any demux packet that has been taken out of queue need to */
+  /* be disposed of before we flush */
+  m_messageQueue.Flush();
+  m_messageQueue.Put(new CDVDMsg(CDVDMsg::GENERAL_FLUSH));
+}
+
+void CDVDTeletextData::Decode_p2829(unsigned char *vtxt_row, TextExtData_t **ptExtData)
+{
+  int bitsleft, colorindex;
+  unsigned char *p;
+  int t1 = CDVDTeletextTools::deh24(&vtxt_row[7-4]);
+  int t2 = CDVDTeletextTools::deh24(&vtxt_row[10-4]);
+
+  if (t1 < 0 || t2 < 0)
+    return;
+
+  if (!(*ptExtData))
+    (*ptExtData) = (TextExtData_t*) calloc(1, sizeof(TextExtData_t));
+  if (!(*ptExtData))
+    return;
+
+  (*ptExtData)->p28Received = 1;
+  (*ptExtData)->DefaultCharset = (t1>>7) & 0x7f;
+  (*ptExtData)->SecondCharset = ((t1>>14) & 0x0f) | ((t2<<4) & 0x70);
+  (*ptExtData)->LSP = !!(t2 & 0x08);
+  (*ptExtData)->RSP = !!(t2 & 0x10);
+  (*ptExtData)->SPL25 = !!(t2 & 0x20);
+  (*ptExtData)->LSPColumns = (t2>>6) & 0x0f;
+
+  bitsleft = 8; /* # of bits not evaluated in val */
+  t2 >>= 10; /* current data */
+  p = &vtxt_row[13-4];  /* pointer to next data triplet */
+  for (colorindex = 0; colorindex < 16; colorindex++)
+  {
+    if (bitsleft < 12)
+    {
+      t2 |= CDVDTeletextTools::deh24(p) << bitsleft;
+      if (t2 < 0)  /* hamming error */
+        break;
+      p += 3;
+      bitsleft += 18;
+    }
+    (*ptExtData)->bgr[colorindex] = t2 & 0x0fff;
+    bitsleft -= 12;
+    t2 >>= 12;
+  }
+  if (t2 < 0 || bitsleft != 14)
+  {
+    (*ptExtData)->p28Received = 0;
+    return;
+  }
+  (*ptExtData)->DefScreenColor = t2 & 0x1f;
+  t2 >>= 5;
+  (*ptExtData)->DefRowColor = t2 & 0x1f;
+  (*ptExtData)->BlackBgSubst = !!(t2 & 0x20);
+  t2 >>= 6;
+  (*ptExtData)->ColorTableRemapping = t2 & 0x07;
+}
+
+void CDVDTeletextData::SavePage(int p, int sp, unsigned char* buffer)
+{
+  CSingleLock lock(m_critSection);
+  TextCachedPage_t* pg = m_TXTCache.astCachetable[p][sp];
+  if (!pg)
+  {
+    CLog::Log(LOGERROR, "CDVDTeletextData: trying to save a not allocated page!!");
+    return;
+  }
+
+  memcpy(pg->data, buffer, 23*40);
+}
+
+void CDVDTeletextData::LoadPage(int p, int sp, unsigned char* buffer)
+{
+  CSingleLock lock(m_critSection);
+  TextCachedPage_t* pg = m_TXTCache.astCachetable[p][sp];
+  if (!pg)
+  {
+    CLog::Log(LOGERROR, "CDVDTeletextData: trying to load a not allocated page!!");
+    return;
+  }
+
+  memcpy(buffer, pg->data, 23*40);
+}
+
+void CDVDTeletextData::ErasePage(int magazine)
+{
+  CSingleLock lock(m_critSection);
+  TextCachedPage_t* pg = m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]];
+  if (pg)
+  {
+    memset(&(pg->pageinfo), 0, sizeof(TextPageinfo_t));  /* struct pageinfo */
+    memset(pg->p0, ' ', 24);
+    memset(pg->data, ' ', 23*40);
+  }
+}
+
+void CDVDTeletextData::AllocateCache(int magazine)
+{
+  /* check cachetable and allocate memory if needed */
+  if (m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]] == 0)
+  {
+    m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]] = new TextCachedPage_t;
+    if (m_TXTCache.astCachetable[m_TXTCache.CurrentPage[magazine]][m_TXTCache.CurrentSubPage[magazine]] )
+    {
+      ErasePage(magazine);
+      m_TXTCache.CachedPages++;
+    }
+  }
+}


Property changes on: trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.h
===================================================================
--- trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.h	                        (rev 0)
+++ trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -0,0 +1,67 @@
+#pragma once
+
+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "../../utils/Thread.h"
+#include "DVDMessageQueue.h"
+#include "utils/TeletextDefines.h"
+
+class CDVDStreamInfo;
+
+class CDVDTeletextData : public CThread
+{
+public:
+  CDVDTeletextData();
+  ~CDVDTeletextData();
+
+  bool CheckStream(CDVDStreamInfo &hints);
+  bool OpenStream(CDVDStreamInfo &hints);
+  void CloseStream(bool bWaitForBuffers);
+  void Flush();
+
+  // waits until all available data has been rendered
+  void WaitForBuffers() { m_messageQueue.WaitUntilEmpty(); }
+  bool AcceptsData() { return !m_messageQueue.IsFull(); }
+  void SendMessage(CDVDMsg* pMsg) { m_messageQueue.Put(pMsg); }
+
+  TextCacheStruct_t* GetTeletextCache() { return &m_TXTCache; }
+  void LoadPage(int p, int sp, unsigned char* buffer);
+
+  CDVDMessageQueue m_messageQueue;
+
+protected:
+  virtual void OnStartup();
+  virtual void OnExit();
+  virtual void Process();
+
+private:
+  void ResetTeletextCache();
+  void Decode_p2829(unsigned char *vtxt_row, TextExtData_t **ptExtData);
+  void SavePage(int p, int sp, unsigned char* buffer);
+  void ErasePage(int magazine);
+  void AllocateCache(int magazine);
+
+  int m_speed;
+  TextCacheStruct_t  m_TXTCache;
+  CCriticalSection m_critSection;
+};
+


Property changes on: trunk/xbmc/cores/dvdplayer/DVDPlayerTeletext.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/xbmc/cores/dvdplayer/Makefile
===================================================================
--- trunk/xbmc/cores/dvdplayer/Makefile	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/dvdplayer/Makefile	2009-09-30 20:49:46 UTC (rev 23277)
@@ -15,6 +15,7 @@
 	DVDPlayer.cpp \
 	DVDPlayerSubtitle.cpp \
 	DVDPlayerVideo.cpp \
+	DVDPlayerTeletext.cpp \
 	DVDStreamInfo.cpp \
 	DVDFileInfo.cpp \
 	DVDPlayerAudioResampler.cpp \

Modified: trunk/xbmc/cores/ffmpeg/avcodec.h
===================================================================
--- trunk/xbmc/cores/ffmpeg/avcodec.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/ffmpeg/avcodec.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -329,6 +329,11 @@
     CODEC_ID_SSA,
     CODEC_ID_MOV_TEXT,
 
+    /* data codecs */
+    CODEC_ID_VBI_DATA= 0x17500,
+    CODEC_ID_VBI_TELETEXT,
+    CODEC_ID_EBU_TELETEXT,
+
     /* other specific kind of codecs (generally used for attachments) */
     CODEC_ID_TTF= 0x18000,
 

Modified: trunk/xbmc/cores/paplayer/MPCCodec/include/config.h.in
===================================================================
--- trunk/xbmc/cores/paplayer/MPCCodec/include/config.h.in	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/cores/paplayer/MPCCodec/include/config.h.in	2009-09-30 20:49:46 UTC (rev 23277)
@@ -1,5 +1,8 @@
 /* include/config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -84,9 +87,17 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

Modified: trunk/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/xbmc/utils/GUIInfoManager.cpp	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/utils/GUIInfoManager.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -64,6 +64,7 @@
 #include "LocalizeStrings.h"
 #include "CPUInfo.h"
 #include "StringUtils.h"
+#include "TeletextDefines.h"
 
 // stuff for current song
 #include "MusicInfoTagLoaderFactory.h"
@@ -543,6 +544,7 @@
     else if (strTest.Equals("videoplayer.videoaspect")) return VIDEOPLAYER_VIDEO_ASPECT;
     else if (strTest.Equals("videoplayer.audiocodec")) return VIDEOPLAYER_AUDIO_CODEC;
     else if (strTest.Equals("videoplayer.audiochannels")) return VIDEOPLAYER_AUDIO_CHANNELS;
+    else if (strTest.Equals("videoplayer.hasteletext")) return VIDEOPLAYER_HASTELETEXT;
   }
   else if (strCategory.Equals("playlist"))
   {
@@ -1937,6 +1939,10 @@
     case PLAYER_HASDURATION:
       bReturn = g_application.GetTotalTime() > 0;
       break;
+    case VIDEOPLAYER_HASTELETEXT:
+      if (g_application.m_pPlayer->GetTeletextCache())
+        bReturn = true;
+      break;
     case VISUALISATION_LOCKED:
       {
         CGUIMessage msg(GUI_MSG_GET_VISUALISATION, 0, 0);
@@ -2926,7 +2932,9 @@
   {
     if (m_currentFile->HasVideoInfoTag() && !m_currentFile->GetVideoInfoTag()->m_strTitle.IsEmpty())
       return m_currentFile->GetVideoInfoTag()->m_strTitle;
-    // don't have the title, so use label, or drop down to title from path
+    // don't have the title, so use dvdplayer, label, or drop down to title from path
+    if (!g_application.m_pPlayer->GetPlayingTitle().IsEmpty())
+      return g_application.m_pPlayer->GetPlayingTitle();
     if (!m_currentFile->GetLabel().IsEmpty())
       return m_currentFile->GetLabel();
     return CUtil::GetTitleFromPath(m_currentFile->m_strPath);

Modified: trunk/xbmc/utils/GUIInfoManager.h
===================================================================
--- trunk/xbmc/utils/GUIInfoManager.h	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/utils/GUIInfoManager.h	2009-09-30 20:49:46 UTC (rev 23277)
@@ -245,6 +245,7 @@
 #define VIDEOPLAYER_AUDIO_CODEC       288
 #define VIDEOPLAYER_AUDIO_CHANNELS    289
 #define VIDEOPLAYER_VIDEO_ASPECT      290
+#define VIDEOPLAYER_HASTELETEXT       291
 
 #define AUDIOSCROBBLER_ENABLED      300
 #define AUDIOSCROBBLER_CONN_STATE   301

Modified: trunk/xbmc/utils/Makefile
===================================================================
--- trunk/xbmc/utils/Makefile	2009-09-30 20:25:35 UTC (rev 23276)
+++ trunk/xbmc/utils/Makefile	2009-09-30 20:49:46 UTC (rev 23277)
@@ -1,4 +1,4 @@
-INCLUDES=-I. -I.. -I../../ -I../linux -I../../guilib
+INCLUDES=-I. -I.. -I../../ -I../linux -I../../guilib -I/usr/include/freetype2
 
 SRCS=AlarmClock.cpp \
      Archive.cpp \
@@ -55,7 +55,8 @@
      LockFree.cpp \
      StreamDetails.cpp \
      TimeUtils.cpp \
-     JobManager.cpp
+     JobManager.cpp \
+     Teletext.cpp
 
 LIB=utils.a
 

Added: trunk/xbmc/utils/Teletext.cpp
===================================================================
--- trunk/xbmc/utils/Teletext.cpp	                        (rev 0)
+++ trunk/xbmc/utils/Teletext.cpp	2009-09-30 20:49:46 UTC (rev 23277)
@@ -0,0 +1,4010 @@
+/*
+ *      Copyright (C) 2005-2009 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+/*
+ * Most Codeparts are taken from the TuxBox Teletext plugin which is based
+ * upon videotext-0.6.19991029 and written by Thomas Loewe (LazyT),
+ * Roland Meier and DBLuelle. See http://www.tuxtxt.net/ for more information.
+ * Many thanks to the TuxBox Teletext Team for this great work.
+ */
+
+#include "Teletext.h"
+#include "GUISettings.h"
+#include "Application.h"
+#include "utils/log.h"
+#include "FileSystem/SpecialProtocol.h"
+#include "Settings.h"
+
+using namespace std;
+
+static const char *TeletextFont = "special://xbmc/media/Fonts/teletext.ttf";
+
+/* spacing attributes */
+#define alpha_black         0x00
+#define alpha_red           0x01
+#define alpha_green         0x02
+#define alpha_yellow        0x03
+#define alpha_blue          0x04
+#define alpha_magenta       0x05
+#define alpha_cyan          0x06
+#define alpha_white         0x07
+#define flash               0x08
+#define steady              0x09
+#define end_box             0x0A
+#define start_box           0x0B
+#define normal_size         0x0C
+#define double_height       0x0D
+#define double_width        0x0E
+#define double_size         0x0F
+#define mosaic_black        0x10
+#define mosaic_red          0x11
+#define mosaic_green        0x12
+#define mosaic_yellow       0x13
+#define mosaic_blue         0x14
+#define mosaic_magenta      0x15
+#define mosaic_cyan         0x16
+#define mosaic_white        0x17
+#define conceal             0x18
+#define contiguous_mosaic   0x19
+#define separated_mosaic    0x1A
+#define esc                 0x1B
+#define black_background    0x1C
+#define new_background      0x1D
+#define hold_mosaic         0x1E
+#define release_mosaic      0x1F
+
+#define RowAddress2Row(row) ((row == 40) ? 24 : (row - 40))
+
+// G2 Set as defined in ETS 300 706
+const unsigned short int G2table[4][6*16] =
+{
+  // Latin G2 Supplementary Set
+  { 0x0020, 0x00A1, 0x00A2, 0x00A3, 0x0024, 0x00A5, 0x0023, 0x00A7, 0x00A4, 0x2018, 0x201C, 0x00AB, 0x2190, 0x2191, 0x2192, 0x2193,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00D7, 0x00B5, 0x00B6, 0x00B7, 0x00F7, 0x2019, 0x201D, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x0020, 0x0300, 0x0301, 0x02C6, 0x0303, 0x02C9, 0x02D8, 0x02D9, 0x00A8, 0x002E, 0x02DA, 0x00B8, 0x005F, 0x02DD, 0x02DB, 0x02C7,
+    0x2014, 0x00B9, 0x00AE, 0x00A9, 0x2122, 0x266A, 0x20AC, 0x2030, 0x03B1, 0x0020, 0x0020, 0x0020, 0x215B, 0x215C, 0x215D, 0x215E,
+    0x2126, 0x00C6, 0x00D0, 0x00AA, 0x0126, 0x0020, 0x0132, 0x013F, 0x0141, 0x00D8, 0x0152, 0x00BA, 0x00DE, 0x0166, 0x014A, 0x0149,
+    0x0138, 0x00E6, 0x0111, 0x00F0, 0x0127, 0x0131, 0x0133, 0x0140, 0x0142, 0x00F8, 0x0153, 0x00DF, 0x00FE, 0x0167, 0x014B, 0x25A0},
+  // Cyrillic G2 Supplementary Set
+  { 0x0020, 0x00A1, 0x00A2, 0x00A3, 0x0024, 0x00A5, 0x0020, 0x00A7, 0x0020, 0x2018, 0x201C, 0x00AB, 0x2190, 0x2191, 0x2192, 0x2193,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00D7, 0x00B5, 0x00B6, 0x00B7, 0x00F7, 0x2019, 0x201D, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF,
+    0x0020, 0x0300, 0x0301, 0x02C6, 0x02DC, 0x02C9, 0x02D8, 0x02D9, 0x00A8, 0x002E, 0x02DA, 0x00B8, 0x005F, 0x02DD, 0x02DB, 0x02C7,
+    0x2014, 0x00B9, 0x00AE, 0x00A9, 0x2122, 0x266A, 0x20AC, 0x2030, 0x03B1, 0x0141, 0x0142, 0x00DF, 0x215B, 0x215C, 0x215D, 0x215E,
+    0x0044, 0x0045, 0x0046, 0x0047, 0x0049, 0x004A, 0x004B, 0x004C, 0x004E, 0x0051, 0x0052, 0x0053, 0x0055, 0x0056, 0x0057, 0x005A,
+    0x0064, 0x0065, 0x0066, 0x0067, 0x0069, 0x006A, 0x006B, 0x006C, 0x006E, 0x0071, 0x0072, 0x0073, 0x0075, 0x0076, 0x0077, 0x007A},
+  // Greek G2 Supplementary Set
+  { 0x0020, 0x0061, 0x0062, 0x00A3, 0x0065, 0x0068, 0x0069, 0x00A7, 0x003A, 0x2018, 0x201C, 0x006B, 0x2190, 0x2191, 0x2192, 0x2193,
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00D7, 0x006D, 0x006E, 0x0070, 0x00F7, 0x2019, 0x201D, 0x0074, 0x00BC, 0x00BD, 0x00BE, 0x0078,
+    0x0020, 0x0300, 0x0301, 0x02C6, 0x02DC, 0x02C9, 0x02D8, 0x02D9, 0x00A8, 0x002E, 0x02DA, 0x00B8, 0x005F, 0x02DD, 0x02DB, 0x02C7,
+    0x003F, 0x00B9, 0x00AE, 0x00A9, 0x2122, 0x266A, 0x20AC, 0x2030, 0x03B1, 0x038A, 0x038E, 0x038F, 0x215B, 0x215C, 0x215D, 0x215E,
+    0x0043, 0x0044, 0x0046, 0x0047, 0x004A, 0x004C, 0x0051, 0x0052, 0x0053, 0x0055, 0x0056, 0x0057, 0x0059, 0x005A, 0x0386, 0x0389,
+    0x0063, 0x0064, 0x0066, 0x0067, 0x006A, 0x006C, 0x0071, 0x0072, 0x0073, 0x0075, 0x0076, 0x0077, 0x0079, 0x007A, 0x0388, 0x25A0},
+  // Arabic G2 Set
+  { 0x0020, 0x0639, 0xFEC9, 0xFE83, 0xFE85, 0xFE87, 0xFE8B, 0xFE89, 0xFB7C, 0xFB7D, 0xFB7A, 0xFB58, 0xFB59, 0xFB56, 0xFB6D, 0xFB8E,
+    0x0660, 0x0661, 0x0662, 0x0663, 0x0664, 0x0665, 0x0666, 0x0667, 0x0668, 0x0669, 0xFECE, 0xFECD, 0xFEFC, 0xFEEC, 0xFEEA, 0xFEE9,
+    0x00E0, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F,
+    0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A, 0x00EB, 0x00EA, 0x00F9, 0x00EE, 0xFECA,
+    0x00E9, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006E, 0x006F,
+    0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007A, 0x00E2, 0x00F4, 0x00FB, 0x00E7, 0x25A0}
+};
+
+//const (avoid warnings :<)
+TextPageAttr_t Text_AtrTable[] =
+{
+  { TXT_ColorWhite  , TXT_ColorBlack , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_WB */
+  { TXT_ColorWhite  , TXT_ColorBlack , C_G0P, 0, 0, 1 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_PassiveDefault */
+  { TXT_ColorWhite  , TXT_ColorRed   , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_L250 */
+  { TXT_ColorBlack  , TXT_ColorYellow, C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_L252 */
+  { TXT_ColorBlack  , TXT_ColorGreen , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_L251 */
+  { TXT_ColorWhite  , TXT_ColorBlue  , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_L253 */
+  { TXT_ColorMagenta, TXT_ColorBlack , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_TOPMENU0 */
+  { TXT_ColorGreen  , TXT_ColorBlack , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_TOPMENU1 */
+  { TXT_ColorYellow , TXT_ColorBlack , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_TOPMENU2 */
+  { TXT_ColorCyan   , TXT_ColorBlack , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_TOPMENU3 */
+  { TXT_ColorMenu2  , TXT_ColorMenu3 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSG0 */
+  { TXT_ColorYellow , TXT_ColorMenu3 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSG1 */
+  { TXT_ColorMenu2  , TXT_ColorTransp, C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSG2 */
+  { TXT_ColorWhite  , TXT_ColorMenu3 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSG3 */
+  { TXT_ColorMenu2  , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSGDRM0 */
+  { TXT_ColorYellow , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSGDRM1 */
+  { TXT_ColorMenu2  , TXT_ColorBlack , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSGDRM2 */
+  { TXT_ColorWhite  , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MSGDRM3 */
+  { TXT_ColorMenu1  , TXT_ColorBlue  , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENUHIL0 5a Z */
+  { TXT_ColorWhite  , TXT_ColorBlue  , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENUHIL1 58 X */
+  { TXT_ColorMenu2  , TXT_ColorTransp, C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENUHIL2 9b \x9B */
+  { TXT_ColorMenu2  , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENU0 ab \xAB */
+  { TXT_ColorYellow , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENU1 a4 \xA4 */
+  { TXT_ColorMenu2  , TXT_ColorTransp, C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENU2 9b \x9B */
+  { TXT_ColorMenu2  , TXT_ColorMenu3 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENU3 cb \xCB */
+  { TXT_ColorCyan   , TXT_ColorMenu3 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENU4 c7 \xC7 */
+  { TXT_ColorWhite  , TXT_ColorMenu3 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENU5 c8 \xC8 */
+  { TXT_ColorWhite  , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_MENU6 a8 \xA8 */
+  { TXT_ColorYellow , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}, /* ATR_CATCHMENU0 a4 \xA4 */
+  { TXT_ColorWhite  , TXT_ColorMenu1 , C_G0P, 0, 0, 0 ,0, 0, 0, 0, 0, 0, 0, 0x3f}  /* ATR_CATCHMENU1 a8 \xA8 */
+};
+
+/* shapes */
+enum
+{
+  S_END = 0,
+  S_FHL, /* full horizontal line: y-offset */
+  S_FVL, /* full vertical line: x-offset */
+  S_BOX, /* rectangle: x-offset, y-offset, width, height */
+  S_TRA, /* trapez: x0, y0, l0, x1, y1, l1 */
+  S_BTR, /* trapez in bgcolor: x0, y0, l0, x1, y1, l1 */
+  S_INV, /* invert */
+  S_LNK, /* call other shape: shapenumber */
+  S_CHR, /* Character from freetype hibyte, lowbyte */
+  S_ADT, /* Character 2F alternating raster */
+  S_FLH, /* flip horizontal */
+  S_FLV  /* flip vertical */
+};
+
+/* shape coordinates */
+enum
+{
+  S_W13 = 5, /* width*1/3 */
+  S_W12, /* width*1/2 */
+  S_W23, /* width*2/3 */
+  S_W11, /* width */
+  S_WM3, /* width-3 */
+  S_H13, /* height*1/3 */
+  S_H12, /* height*1/2 */
+  S_H23, /* height*2/3 */
+  S_H11, /* height */
+  S_NrShCoord
+};
+
+/* G3 characters */
+unsigned char aG3_20[] = { S_TRA, 0, S_H23, 1, 0, S_H11, S_W12, S_END };
+unsigned char aG3_21[] = { S_TRA, 0, S_H23, 1, 0, S_H11, S_W11, S_END };
+unsigned char aG3_22[] = { S_TRA, 0, S_H12, 1, 0, S_H11, S_W12, S_END };
+unsigned char aG3_23[] = { S_TRA, 0, S_H12, 1, 0, S_H11, S_W11, S_END };
+unsigned char aG3_24[] = { S_TRA, 0, 0, 1, 0, S_H11, S_W12, S_END };
+unsigned char aG3_25[] = { S_TRA, 0, 0, 1, 0, S_H11, S_W11, S_END };
+unsigned char aG3_26[] = { S_INV, S_LNK, 0x66, S_END };
+unsigned char aG3_27[] = { S_INV, S_LNK, 0x67, S_END };
+unsigned char aG3_28[] = { S_INV, S_LNK, 0x68, S_END };
+unsigned char aG3_29[] = { S_INV, S_LNK, 0x69, S_END };
+unsigned char aG3_2a[] = { S_INV, S_LNK, 0x6a, S_END };
+unsigned char aG3_2b[] = { S_INV, S_LNK, 0x6b, S_END };
+unsigned char aG3_2c[] = { S_INV, S_LNK, 0x6c, S_END };
+unsigned char aG3_2d[] = { S_INV, S_LNK, 0x6d, S_END };
+unsigned char aG3_2e[] = { S_BOX, 2, 0, 3, S_H11, S_END };
+unsigned char aG3_2f[] = { S_ADT };
+unsigned char aG3_30[] = { S_LNK, 0x20, S_FLH, S_END };
+unsigned char aG3_31[] = { S_LNK, 0x21, S_FLH, S_END };
+unsigned char aG3_32[] = { S_LNK, 0x22, S_FLH, S_END };
+unsigned char aG3_33[] = { S_LNK, 0x23, S_FLH, S_END };
+unsigned char aG3_34[] = { S_LNK, 0x24, S_FLH, S_END };
+unsigned char aG3_35[] = { S_LNK, 0x25, S_FLH, S_END };
+unsigned char aG3_36[] = { S_INV, S_LNK, 0x76, S_END };
+unsigned char aG3_37[] = { S_INV, S_LNK, 0x77, S_END };
+unsigned char aG3_38[] = { S_INV, S_LNK, 0x78, S_END };
+unsigned char aG3_39[] = { S_INV, S_LNK, 0x79, S_END };
+unsigned char aG3_3a[] = { S_INV, S_LNK, 0x7a, S_END };
+unsigned char aG3_3b[] = { S_INV, S_LNK, 0x7b, S_END };
+unsigned char aG3_3c[] = { S_INV, S_LNK, 0x7c, S_END };
+unsigned char aG3_3d[] = { S_INV, S_LNK, 0x7d, S_END };
+unsigned char aG3_3e[] = { S_LNK, 0x2e, S_FLH, S_END };
+unsigned char aG3_3f[] = { S_BOX, 0, 0, S_W11, S_H11, S_END };
+unsigned char aG3_40[] = { S_BOX, 0, S_H13, S_W11, S_H13, S_LNK, 0x7e, S_END };
+unsigned char aG3_41[] = { S_BOX, 0, S_H13, S_W11, S_H13, S_LNK, 0x7e, S_FLV, S_END };
+unsigned char aG3_42[] = { S_LNK, 0x50, S_BOX, S_W12, S_H13, S_W12, S_H13, S_END };
+unsigned char aG3_43[] = { S_LNK, 0x50, S_BOX, 0, S_H13, S_W12, S_H13, S_END };
+unsigned char aG3_44[] = { S_LNK, 0x48, S_FLV, S_LNK, 0x48, S_END };
+unsigned char aG3_45[] = { S_LNK, 0x44, S_FLH, S_END };
+unsigned char aG3_46[] = { S_LNK, 0x47, S_FLV, S_END };
+unsigned char aG3_47[] = { S_LNK, 0x48, S_FLH, S_LNK, 0x48, S_END };
+unsigned char aG3_48[] = { S_TRA, 0, 0, S_W23, 0, S_H23, 0, S_BTR, 0, 0, S_W13, 0, S_H13, 0, S_END };
+unsigned char aG3_49[] = { S_LNK, 0x48, S_FLH, S_END };
+unsigned char aG3_4a[] = { S_LNK, 0x48, S_FLV, S_END };
+unsigned char aG3_4b[] = { S_LNK, 0x48, S_FLH, S_FLV, S_END };
+unsigned char aG3_4c[] = { S_LNK, 0x50, S_BOX, 0, S_H13, S_W11, S_H13, S_END };
+unsigned char aG3_4d[] = { S_CHR, 0x25, 0xE6 };
+unsigned char aG3_4e[] = { S_CHR, 0x25, 0xCF };
+unsigned char aG3_4f[] = { S_CHR, 0x25, 0xCB };
+unsigned char aG3_50[] = { S_BOX, S_W12, 0, 2, S_H11, S_FLH, S_BOX, S_W12, 0, 2, S_H11,S_END };
+unsigned char aG3_51[] = { S_BOX, 0, S_H12, S_W11, 2, S_FLV, S_BOX, 0, S_H12, S_W11, 2,S_END };
+unsigned char aG3_52[] = { S_LNK, 0x55, S_FLH, S_FLV, S_END };
+unsigned char aG3_53[] = { S_LNK, 0x55, S_FLV, S_END };
+unsigned char aG3_54[] = { S_LNK, 0x55, S_FLH, S_END };
+unsigned char aG3_55[] = { S_LNK, 0x7e, S_FLV, S_BOX, 0, S_H12, S_W12, 2, S_FLV, S_BOX, 0, S_H12, S_W12, 2, S_END };
+unsigned char aG3_56[] = { S_LNK, 0x57, S_FLH, S_END};
+unsigned char aG3_57[] = { S_LNK, 0x55, S_LNK, 0x50 , S_END};
+unsigned char aG3_58[] = { S_LNK, 0x59, S_FLV, S_END};
+unsigned char aG3_59[] = { S_LNK, 0x7e, S_LNK, 0x51 , S_END};
+unsigned char aG3_5a[] = { S_LNK, 0x50, S_LNK, 0x51 , S_END};
+unsigned char aG3_5b[] = { S_CHR, 0x21, 0x92};
+unsigned char aG3_5c[] = { S_CHR, 0x21, 0x90};
+unsigned char aG3_5d[] = { S_CHR, 0x21, 0x91};
+unsigned char aG3_5e[] = { S_CHR, 0x21, 0x93};
+unsigned char aG3_5f[] = { S_CHR, 0x00, 0x20};
+unsigned char aG3_60[] = { S_INV, S_LNK, 0x20, S_END };
+unsigned char aG3_61[] = { S_INV, S_LNK, 0x21, S_END };
+unsigned char aG3_62[] = { S_INV, S_LNK, 0x22, S_END };
+unsigned char aG3_63[] = { S_INV, S_LNK, 0x23, S_END };
+unsigned char aG3_64[] = { S_INV, S_LNK, 0x24, S_END };
+unsigned char aG3_65[] = { S_INV, S_LNK, 0x25, S_END };
+unsigned char aG3_66[] = { S_LNK, 0x20, S_FLV, S_END };
+unsigned char aG3_67[] = { S_LNK, 0x21, S_FLV, S_END };
+unsigned char aG3_68[] = { S_LNK, 0x22, S_FLV, S_END };
+unsigned char aG3_69[] = { S_LNK, 0x23, S_FLV, S_END };
+unsigned char aG3_6a[] = { S_LNK, 0x24, S_FLV, S_END };
+unsigned char aG3_6b[] = { S_BOX, 0, 0, S_W11, S_H13, S_TRA, 0, S_H13, S_W11, 0, S_H23, 1, S_END };
+unsigned char aG3_6c[] = { S_TRA, 0, 0, 1, 0, S_H12, S_W12, S_FLV, S_TRA, 0, 0, 1, 0, S_H12, S_W12, S_BOX, 0, S_H12, S_W12,1, S_END };
+unsigned char aG3_6d[] = { S_TRA, 0, 0, S_W12, S_W12, S_H12, 0, S_FLH, S_TRA, 0, 0, S_W12, S_W12, S_H12, 0, S_END };
+unsigned char aG3_6e[] = { S_CHR, 0x00, 0x20};
+unsigned char aG3_6f[] = { S_CHR, 0x00, 0x20};
+unsigned char aG3_70[] = { S_INV, S_LNK, 0x30, S_END };
+unsigned char aG3_71[] = { S_INV, S_LNK, 0x31, S_END };
+unsigned char aG3_72[] = { S_INV, S_LNK, 0x32, S_END };
+unsigned char aG3_73[] = { S_INV, S_LNK, 0x33, S_END };
+unsigned char aG3_74[] = { S_INV, S_LNK, 0x34, S_END };
+unsigned char aG3_75[] = { S_INV, S_LNK, 0x35, S_END };
+unsigned char aG3_76[] = { S_LNK, 0x66, S_FLH, S_END };
+unsigned char aG3_77[] = { S_LNK, 0x67, S_FLH, S_END };
+unsigned char aG3_78[] = { S_LNK, 0x68, S_FLH, S_END };
+unsigned char aG3_79[] = { S_LNK, 0x69, S_FLH, S_END };
+unsigned char aG3_7a[] = { S_LNK, 0x6a, S_FLH, S_END };
+unsigned char aG3_7b[] = { S_LNK, 0x6b, S_FLH, S_END };
+unsigned char aG3_7c[] = { S_LNK, 0x6c, S_FLH, S_END };

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 23273
          http://xbmc.svn.sourceforge.net/xbmc/?rev=23273&view=rev
Author:   vdrfan
Date:     2009-09-30 18:25:32 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
changed: simplified on resume scan (thanks cptspiff)

Modified Paths:
--------------
    trunk/xbmc/PowerManager.cpp

Modified: trunk/xbmc/PowerManager.cpp
===================================================================
--- trunk/xbmc/PowerManager.cpp	2009-09-30 18:18:15 UTC (rev 23272)
+++ trunk/xbmc/PowerManager.cpp	2009-09-30 18:25:32 UTC (rev 23273)
@@ -181,26 +181,8 @@
   g_lcd->Initialize();
 #endif
 
-  // update video library
-  if (g_guiSettings.GetBool("videolibrary.updateonstartup"))
-  {
-    CLog::Log(LOGNOTICE, "%s: Updating video library on resume", __FUNCTION__);
-    CGUIDialogVideoScan *scanner = (CGUIDialogVideoScan *)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
-    SScraperInfo info;
-    VIDEO::SScanSettings settings;
-    if (scanner && !scanner->IsScanning())
-      scanner->StartScanning("",info,settings,false);
-  }
+  g_application.UpdateLibraries();
 
-  // update music library
-  if (g_guiSettings.GetBool("musiclibrary.updateonstartup"))
-  {
-    CLog::Log(LOGNOTICE, "%s: Updating music library on resume", __FUNCTION__);
-    CGUIDialogMusicScan *scanner = (CGUIDialogMusicScan *)m_gWindowManager.GetWindow(WINDOW_DIALOG_MUSIC_SCAN);
-    if (scanner && !scanner->IsScanning())
-      scanner->StartScanning("");
-  }
-
   // reset
   g_application.m_bRunResumeJobs = false;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.