actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow more movie types for bgchanges

Browse Source
This commit is contained in:
Devin J. Pohly
2013-06-02 03:41:33 -04:00
parent 1a38ec56fc
commit 4aee1ed738
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ActorUtil.cpp
+6 -1
View File
@@ -400,7 +400,12 @@ FileType ActorUtil::GetFileType( const RString &sPath )
else if(
sExt=="ogv" ||
sExt=="avi" ||
sExt=="mpeg" ||
sExt=="mpeg" ||
sExt=="mp4" ||
sExt=="mkv" ||
sExt=="mov" ||
sExt=="flv" ||
sExt=="f4v" ||
sExt=="mpg" ) return FT_Movie;
else if(
sExt=="txt" ) return FT_Model;
src/BackgroundUtil.cpp
+5
View File
@@ -198,6 +198,11 @@ void BackgroundUtil::GetSongMovies( const Song *pSong, const RString &sMatch, ve
GetDirListing( pSong->GetSongDir()+sMatch+"*.avi", vsPathsOut, false, true );
GetDirListing( pSong->GetSongDir()+sMatch+"*.mpg", vsPathsOut, false, true );
GetDirListing( pSong->GetSongDir()+sMatch+"*.mpeg", vsPathsOut, false, true );
GetDirListing( pSong->GetSongDir()+sMatch+"*.mp4", vsPathsOut, false, true );
GetDirListing( pSong->GetSongDir()+sMatch+"*.flv", vsPathsOut, false, true );
GetDirListing( pSong->GetSongDir()+sMatch+"*.f4v", vsPathsOut, false, true );
GetDirListing( pSong->GetSongDir()+sMatch+"*.mov", vsPathsOut, false, true );
GetDirListing( pSong->GetSongDir()+sMatch+"*.mkv", vsPathsOut, false, true );
}
else
{
src/RageTextureManager.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ RageTexture* RageTextureManager::LoadTextureInternal( RageTextureID ID )
RageTexture* pTexture;
if( ID.filename == g_sDefaultTextureName )
pTexture = new RageTexture_Default;
else if( sExt == "ogv" || sExt == "avi" || sExt == "mpg" || sExt == "mpeg" )
else if( sExt == "ogv" || sExt == "avi" || sExt == "mpg" || sExt == "mpeg" || sExt == "mp4" || sExt == "mkv" || sExt == "mov" || sExt == "flv" || sExt == "f4v")
pTexture = RageMovieTexture::Create( ID );
else
pTexture = new RageBitmapTexture( ID );
src/Song.cpp
+6
View File
@@ -822,6 +822,12 @@ void Song::TidyUpData( bool fromCache, bool /* duringCache */ )
GetDirListing( m_sSongDir + RString("*.avi"), arrayPossibleMovies );
GetDirListing( m_sSongDir + RString("*.mpg"), arrayPossibleMovies );
GetDirListing( m_sSongDir + RString("*.mpeg"), arrayPossibleMovies );
GetDirListing( m_sSongDir + RString("*.mp4"), arrayPossibleMovies );
GetDirListing( m_sSongDir + RString("*.mkv"), arrayPossibleMovies );
GetDirListing( m_sSongDir + RString("*.flv"), arrayPossibleMovies );
GetDirListing( m_sSongDir + RString("*.f4v"), arrayPossibleMovies );
GetDirListing( m_sSongDir + RString("*.mov"), arrayPossibleMovies );
/* Use this->GetBeatFromElapsedTime(0) instead of 0 to start when the
* music starts. */
if( arrayPossibleMovies.size() == 1 )