16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 04:19:19 +02:00

Merge branch 'tmj-dev' into milek-dev

This commit is contained in:
milek7
2018-05-19 20:26:01 +02:00
41 changed files with 6565 additions and 537 deletions

View File

@@ -180,7 +180,7 @@ buffer_manager::find_buffer( std::string const &Buffername ) const {
std::string
buffer_manager::find_file( std::string const &Filename ) const {
std::vector<std::string> const extensions { ".wav", ".WAV", ".flac", ".ogg" };
std::vector<std::string> const extensions { ".ogg", ".flac", ".wav" };
for( auto const &extension : extensions ) {
if( FileExists( Filename + extension ) ) {