Load videos from the .ogv extension rather than .avi.

stump · Nov 21, 2010 · e9c8b98 · e9c8b98
1 parent 4f63b9d
commit e9c8b98
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Credits.py b/src/Credits.py
@@ -179,7 +179,7 @@ def __init__(self, engine, songName = None):
       #  - credits_video_start_time
       #  - credits_video_end_time
       vidSource = os.path.join(Version.dataPath(), 'themes', self.themename, \
-                               'menu', 'credits.avi')
+                               'menu', 'credits.ogv')
       if os.path.exists(vidSource):
         winWidth, winHeight = self.engine.view.geometry[2:4]
         songVideoStartTime = 0

diff --git a/src/FoFiX.py b/src/FoFiX.py
@@ -225,7 +225,7 @@ def main():
     #  - intro_video_end_time
     themename = Config.get("coffee", "themename")
     vidSource = os.path.join(Version.dataPath(), 'themes', themename, \
-                             'menu', 'intro.avi')
+                             'menu', 'intro.ogv')
     if os.path.isfile(vidSource):
       winWidth, winHeight = engine.view.geometry[2:4]
       songVideoStartTime = 0

diff --git a/src/Stage.py b/src/Stage.py
@@ -102,21 +102,21 @@ def loadVideo(self, libraryName, songName, songVideo = None,
       if songVideo is not None and \
              os.path.isfile(os.path.join(songAbsPath, songVideo)):
         self.vidSource = os.path.join(songAbsPath, songVideo)
-      elif os.path.exists(os.path.join(songAbsPath, "default.avi")):
+      elif os.path.exists(os.path.join(songAbsPath, "default.ogv")):
         Log.warn("Video not found: %s" % \
                  os.path.join(songAbsPath, songVideo))
-        self.vidSource = os.path.join(songAbsPath, "default.avi")
+        self.vidSource = os.path.join(songAbsPath, "default.ogv")
     if self.vidSource is None:
       if self.songStage == 1:
         Log.warn("Video not found: %s" % \
-                 os.path.join(songAbsPath, "default.avi"))
+                 os.path.join(songAbsPath, "default.ogv"))
       songVideoStartTime = None
       songVideoEndTime = None
-      self.vidSource = os.path.join(self.pathfull, "default.avi")
+      self.vidSource = os.path.join(self.pathfull, "default.ogv")
 
     if not os.path.exists(self.vidSource):
       Log.warn("Video not found: %s" % \
-               os.path.join(self.pathfull, "default.avi"))
+               os.path.join(self.pathfull, "default.ogv"))
       Log.warn("No video found, falling back to default static image mode for now")
       self.mode = 1 # Fallback
       self.vidSource = None