Merge pull request #15 from DanCooper/patch-7

Better solution for XBMC Trailer
bodrick · Apr 16, 2012 · f2d8d80 · f2d8d80
2 parents 0ff6c16 + 9428a54
commit f2d8d80
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Addons/scraper.EmberCore/scraperMovieNativeModule.vb b/Addons/scraper.EmberCore/scraperMovieNativeModule.vb
@@ -383,10 +383,13 @@ Public Class EmberNativeScraperModule
         If Master.GlobalScrapeMod.Trailer AndAlso MySettings.DownloadTrailers Then
             tURL = Trailer.DownloadSingleTrailer(DBMovie.Filename, DBMovie.Movie.IMDBID, DBMovie.isSingle, DBMovie.Movie.Trailer)
             If Not String.IsNullOrEmpty(tURL) Then
-                If tURL.Substring(0, 7) = "http://" Then
+                If tURL.Substring(0, 22) = "http://www.youtube.com" Then
-                    DBMovie.Movie.Trailer = tURL
+                    If AdvancedSettings.GetBooleanSetting("UseTMDBTrailerXBMC", False) Then
-                    'doSave = True
+                        DBMovie.Movie.Trailer = Replace(tURL, "http://www.youtube.com/watch?v=", "plugin://plugin.video.youtube/?action=play_video&videoid=")
-                ElseIf tURL.Substring(0, 9) = "plugin://" Then
+                    Else
+                        DBMovie.Movie.Trailer = tURL
+                    End If
+                ElseIf tURL.Substring(0, 7) = "http://" Then
                     DBMovie.Movie.Trailer = tURL
                 Else
                     DBMovie.TrailerPath = tURL