Merge branch 'master' of github.com:stump/fofix

.gitignore

@@ -16,12 +16,14 @@ src/pypitch/_pypitch.cpp
 src/cmgl.c
 gstreamer/*
 data/library.zip
-data/users/players/FoFiX-players.cache
-data/users/players/*.png
+data/users/players/*
+!data/users/players/default.png
+!data/users/players/default.ini
+data/users/controllers/*
+!data/users/controllers/default[dgm].ini
 data/songs/
 data/themes/*
 !data/themes/MegaLight
 !data/themes/MegaLight GH3
 !data/themes/MegaLight V4
 !data/themes/Uberlight
-!data/users/players/default.png

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

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

src/Neck.py

@@ -63,7 +63,7 @@ def __init__(self, engine, instrument, playerObj):
     self.boardLength    = self.engine.theme.neckLength
     self.shaderSolocolor    = self.engine.theme.shaderSolocolor
 
-    self.boardFadeAmmount = self.engine.theme.boardFade
+    self.boardFadeAmount = self.engine.theme.boardFade
 
     #death_au: fixed neck size
 
@@ -83,8 +83,8 @@ def __init__(self, engine, instrument, playerObj):
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], self.vis],
                              [color[0],color[1],color[2], self.vis],
-                             [color[0],color[1],color[2], self.vis/self.boardFadeAmmount],
-                             [color[0],color[1],color[2], self.vis/self.boardFadeAmmount],
+                             [color[0],color[1],color[2], self.vis/self.boardFadeAmount],
+                             [color[0],color[1],color[2], self.vis/self.boardFadeAmount],
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], 0]], dtype=np.float32)
 
@@ -405,8 +405,8 @@ def project(beat):
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], v],
                              [color[0],color[1],color[2], v],
-                             [color[0],color[1],color[2], v/self.boardFadeAmmount],
-                             [color[0],color[1],color[2], v/self.boardFadeAmmount],
+                             [color[0],color[1],color[2], v/self.boardFadeAmount],
+                             [color[0],color[1],color[2], v/self.boardFadeAmount],
                              [color[0],color[1],color[2], 0],
                              [color[0],color[1],color[2], 0]], dtype=np.float32)
 
@@ -583,8 +583,8 @@ def project(beat):
                          [color[0],color[1],color[2], v],
                          [color[0],color[1],color[2], v],
                          [color[0],color[1],color[2], v],
-                         [color[0],color[1],color[2], v/self.boardFadeAmmount],
-                         [color[0],color[1],color[2], v/self.boardFadeAmmount],
+                         [color[0],color[1],color[2], v/self.boardFadeAmount],
+                         [color[0],color[1],color[2], v/self.boardFadeAmount],
                          [color[0],color[1],color[2], 0],
                          [color[0],color[1],color[2], 0]], dtype=np.float32)
       cmgl.drawArrays(GL_TRIANGLE_STRIP, vertices=track_vtx, colors=track_col, texcoords=track_tex)

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

src/Theme.py

@@ -158,7 +158,7 @@ def get(value, type = str, default = None):
       self.povOrigin  = (get("pov_origin_x", float), get("pov_origin_y", float), get("pov_origin_z", float))
 
       #Fade settings for fretboard
-      self.boardFade = (get("fretboard_fade_ammount", float, 1))
+      self.boardFade = (get("fretboard_fade_amount", float, 1))
 
       #Loading phrases
       self.loadingPhrase = get("loading_phrase", str, "Let's get this show on the Road_Impress the Crowd_" + 

src/VideoPlayer.py

@@ -119,25 +119,29 @@ def videoDiscover(self, d, isMedia):
       vcodec = d.tags.get('video-codec', '[plugin did not give a name]')
       Log.debug('Video codec: ' + vcodec)
       if vcodec not in FUTUREPROOF_VIDEO_CODECS:
-        Log.warn('Support for %s is not guaranteed in the future; try one of: %s' % (vcodec, ', '.join(FUTUREPROOF_VIDEO_CODECS)))
+        self.validFile = False
 
       if d.is_audio:
         acodec = d.tags.get('audio-codec', '[plugin did not give a name]')
         Log.debug('Audio codec: ' + acodec)
         if acodec not in FUTUREPROOF_AUDIO_CODECS:
-          Log.warn('Support for %s is not guaranteed in the future; try one of: %s' % (acodec, ', '.join(FUTUREPROOF_AUDIO_CODECS)))
+          self.validFile = False
 
       container = d.tags.get('container-format', '[plugin did not give a name]')
       Log.debug('Container format: ' + container)
       if container not in FUTUREPROOF_CONTAINERS:
-        Log.warn('Support for %s is not guaranteed in the future; try one of: %s' % (container, ', '.join(FUTUREPROOF_CONTAINERS)))
-
-      self.vidWidth, self.vidHeight = d.videowidth, d.videoheight
-      # Force mute if no sound track is available or
-      # else you'll get nothing but a black screen!
-      if not d.is_audio and not self.mute:
-        Log.warn("Video has no sound ==> forcing mute.")
-        self.mute = True
+        self.validFile = False
+
+      if not self.validFile:
+        Log.warn('Refusing to play non-Ogg, non-Theora, or (if audio is present) non-Vorbis video file.')
+      else:
+        self.vidWidth, self.vidHeight = d.videowidth, d.videoheight
+        # Force mute if no sound track is available or
+        # else you'll get nothing but a black screen!
+        if not d.is_audio and not self.mute:
+          Log.warn("Video has no sound ==> forcing mute.")
+          self.mute = True
+
     else:
       self.validFile = False