Mercurial > otakunoraifu
comparison music2/movie.cc @ 53:ddbcbd000206
* MuSys, AyuSysConfig, FileSearcher (former FILESEARCHER) and KeyHolder (former KEYHOLDER) are now singletons
* ParseMoji moved to TextStream
* Some cleaning (0 -> NULL when needed, removal of useless returns, ...)
author | thib |
---|---|
date | Sun, 19 Apr 2009 11:44:05 +0000 |
parents | 15a18fbe6f21 |
children | 4416cfac86ae |
comparison
equal
deleted
inserted
replaced
52:15a18fbe6f21 | 53:ddbcbd000206 |
---|---|
69 #endif | 69 #endif |
70 return; | 70 return; |
71 } | 71 } |
72 | 72 |
73 const char* FindMovieFile(const char* path) { | 73 const char* FindMovieFile(const char* path) { |
74 ARCINFO* info = file_searcher.Find(FILESEARCH::MOV, path, "avi"); | 74 FileSearcher* file_searcher = FileSearcher::GetInstance(); |
75 ARCINFO* info = file_searcher->Find(FileSearcher::MOV, path, "avi"); | |
75 if (info == NULL) | 76 if (info == NULL) |
76 info = file_searcher.Find(FILESEARCH::MOV,path,"mpg"); | 77 info = file_searcher->Find(FileSearcher::MOV,path,"mpg"); |
77 if (info == NULL) return NULL; | 78 if (info == NULL) return NULL; |
78 const char* file = info->Path(); | 79 const char* file = info->Path(); |
79 delete info; | 80 delete info; |
80 return file; | 81 return file; |
81 } | 82 } |