comparison framework/MainWindowBase.h @ 213:eed79c69be61

Merge
author Chris Cannam
date Mon, 25 Oct 2010 11:11:33 +0200
parents 84422236db20 143e1b56e81b
children b96d90975f7c
comparison
equal deleted inserted replaced
212:fe83e6e68683 213:eed79c69be61
93 }; 93 };
94 94
95 virtual FileOpenStatus open(QString fileOrUrl, AudioFileOpenMode = AskUser); 95 virtual FileOpenStatus open(QString fileOrUrl, AudioFileOpenMode = AskUser);
96 virtual FileOpenStatus open(FileSource source, AudioFileOpenMode = AskUser); 96 virtual FileOpenStatus open(FileSource source, AudioFileOpenMode = AskUser);
97 97
98 virtual FileOpenStatus openAudio(FileSource source, AudioFileOpenMode = AskUser); 98 virtual FileOpenStatus openAudio(FileSource source, AudioFileOpenMode = AskUser, QString templateName = "");
99 virtual FileOpenStatus openPlaylist(FileSource source, AudioFileOpenMode = AskUser); 99 virtual FileOpenStatus openPlaylist(FileSource source, AudioFileOpenMode = AskUser);
100 virtual FileOpenStatus openLayer(FileSource source); 100 virtual FileOpenStatus openLayer(FileSource source);
101 virtual FileOpenStatus openImage(FileSource source); 101 virtual FileOpenStatus openImage(FileSource source);
102 102
103 virtual FileOpenStatus openSessionFile(QString fileOrUrl); 103 virtual FileOpenStatus openSessionFile(QString fileOrUrl);