Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -13,12 +13,11 @@ class OpenSLESStream final : public SoundStream
{
#ifdef ANDROID
public:
bool Start() override;
void Stop() override;
static bool isValid() { return true; }
bool Start() override;
void Stop() override;
static bool isValid() { return true; }
private:
std::thread thread;
Common::Event soundSyncEvent;
#endif // HAVE_OPENSL
std::thread thread;
Common::Event soundSyncEvent;
#endif // HAVE_OPENSL
};