diff --git a/bazaar/VLCPlayer/VLCPlayer.cpp b/bazaar/VLCPlayer/VLCPlayer.cpp index 0f67de577..8955854c4 100644 --- a/bazaar/VLCPlayer/VLCPlayer.cpp +++ b/bazaar/VLCPlayer/VLCPlayer.cpp @@ -154,7 +154,6 @@ VLCPlayer::VLCPlayer() { this->SetTimeCallback(1000,THISBACK(StartPlay)); } void VLCPlayer::StartPlay(){ - AddPlayList(GetHomeDirFile("Видео/DiscountTerminals.avi")); Play(); } diff --git a/bazaar/VLCPlayerTest/main.cpp b/bazaar/VLCPlayerTest/main.cpp index 06f99b4e5..62f3123b7 100644 --- a/bazaar/VLCPlayerTest/main.cpp +++ b/bazaar/VLCPlayerTest/main.cpp @@ -27,7 +27,7 @@ void MainLayDlg::Layout() { Size ws = GetSize()/2; ws.cy = ws.cx / 16 * 9; player.SetVSize(ws); - if (!player.playactive) { + if (AtomicRead(player.playeractive)!=1) { INTERLOCKED_(mtx) { @@ -93,8 +93,6 @@ GUI_APP_MAIN { MainLayDlg app; app.OpenMain(); app.player.AddPlayList(GetHomeDirFile("Видео/Avaria-Leto vsegda1-5.avi")); - //app.player.AddPlayList(GetHomeDirFile("Видео/Фильмы/Hunting__(2009-09).avi")); - //app.player.AddPlayList(GetHomeDirFile("Видео/Фильмы/Varshavyanka__(2009-09).avi")); app.Run(); }