diff options
7 files changed, 20 insertions, 18 deletions
diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp index ed2abd5e2a..2a681bcb71 100644 --- a/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp +++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp @@ -58,7 +58,7 @@ using namespace XFILE; -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) extern HWND g_hWnd; #endif @@ -87,7 +87,7 @@ CExternalPlayer::CExternalPlayer(IPlayerCallback& callback) m_yPos = 0; -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) memset(&m_processInfo, 0, sizeof(m_processInfo)); #endif } @@ -125,7 +125,7 @@ bool CExternalPlayer::CloseFile(bool reopen) if (m_dialog && m_dialog->IsActive()) m_dialog->Close(); -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) if (m_bIsPlaying && m_processInfo.hProcess) { TerminateProcess(m_processInfo.hProcess, 1); @@ -228,7 +228,7 @@ void CExternalPlayer::Process() // make sure we surround the arguments with quotes where necessary std::string strFName; std::string strFArgs; -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) // W32 batch-file handline if (StringUtils::EndsWith(m_filename, ".bat") || StringUtils::EndsWith(m_filename, ".cmd")) { @@ -259,7 +259,7 @@ void CExternalPlayer::Process() strFArgs.append("\""); } -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) if (m_warpcursor) { GetCursorPos(&m_ptCursorpos); @@ -292,7 +292,7 @@ void CExternalPlayer::Process() CLog::Log(LOGNOTICE, "%s: Hiding %s window", __FUNCTION__, CCompileInfo::GetAppName()); g_Windowing.Hide(); } -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) else if (currentStyle & WS_EX_TOPMOST) { CLog::Log(LOGNOTICE, "%s: Lowering %s window", __FUNCTION__, CCompileInfo::GetAppName()); @@ -322,7 +322,7 @@ void CExternalPlayer::Process() m_callback.OnPlayBackStarted(m_file); bool ret = true; -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) ret = ExecuteAppW32(strFName.c_str(),strFArgs.c_str()); #elif defined(TARGET_ANDROID) ret = ExecuteAppAndroid(m_filename.c_str(), mainFile.c_str()); @@ -355,7 +355,7 @@ void CExternalPlayer::Process() m_bIsPlaying = false; CLog::Log(LOGNOTICE, "%s: Stop", __FUNCTION__); -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) g_Windowing.Restore(); if (currentStyle & WS_EX_TOPMOST) @@ -371,7 +371,7 @@ void CExternalPlayer::Process() g_Windowing.Show(); } -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) if (m_warpcursor) { m_xPos = 0; @@ -402,7 +402,7 @@ void CExternalPlayer::Process() m_callback.OnPlayBackEnded(); } -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) bool CExternalPlayer::ExecuteAppW32(const char* strPath, const char* strSwitches) { CLog::Log(LOGNOTICE, "%s: %s %s", __FUNCTION__, strPath, strSwitches); @@ -596,7 +596,7 @@ bool CExternalPlayer::Initialize(TiXmlElement* pConfig) XMLUtils::GetBoolean(pConfig, "hidexbmc", m_hidexbmc); if (!XMLUtils::GetBoolean(pConfig, "hideconsole", m_hideconsole)) { -#ifdef TARGET_WINDOWS +#ifdef TARGET_WINDOWS_DESKTOP // Default depends on whether player is a batch file m_hideconsole = StringUtils::EndsWith(m_filename, ".bat"); #endif @@ -629,7 +629,7 @@ bool CExternalPlayer::Initialize(TiXmlElement* pConfig) m_islauncher ? "true" : "false", warpCursor.c_str()); -#ifdef TARGET_WINDOWS +#ifdef TARGET_WINDOWS_DESKTOP m_filenameReplacers.push_back("^smb:// , / , \\\\ , g"); m_filenameReplacers.push_back("^smb:\\\\\\\\ , smb:(\\\\\\\\[^\\\\]*\\\\) , \\1 , "); #endif diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.h b/xbmc/cores/ExternalPlayer/ExternalPlayer.h index 5fd4a6170c..b49c2a4986 100644 --- a/xbmc/cores/ExternalPlayer/ExternalPlayer.h +++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.h @@ -63,7 +63,7 @@ public: std::string GetPlayerState() override; bool SetPlayerState(const std::string& state) override; -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) bool ExecuteAppW32(const char* strPath, const char* strSwitches); //static void CALLBACK AppFinished(void* closure, BOOLEAN TimerOrWaitFired); #elif defined(TARGET_ANDROID) @@ -86,7 +86,7 @@ private: int m_time; std::string m_launchFilename; HWND m_hwndXbmc; -#if defined(TARGET_WINDOWS) +#if defined(TARGET_WINDOWS_DESKTOP) POINT m_ptCursorpos; PROCESS_INFORMATION m_processInfo; #endif diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/CMakeLists.txt b/xbmc/cores/VideoPlayer/DVDCodecs/Video/CMakeLists.txt index f4f5b07ad2..326bf84185 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/CMakeLists.txt +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/CMakeLists.txt @@ -18,7 +18,7 @@ if(AML_FOUND) DVDVideoCodecAmlogic.h) endif() -if(CORE_SYSTEM_NAME STREQUAL windows) +if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore) list(APPEND SOURCES DXVA.cpp) list(APPEND HEADERS DXVA.h) endif() diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp index d4f652516d..40ce71838a 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp @@ -1106,6 +1106,7 @@ CDVDVideoCodec::VCReturn CDecoder::Check(AVCodecContext* avctx) && avctx->codec_id != AV_CODEC_ID_WMV3) return CDVDVideoCodec::VC_NONE; +#ifdef TARGET_WINDOWS_DESKTOP D3D11_VIDEO_DECODER_EXTENSION data = {0}; union { DXVA_Status_H264 h264; @@ -1133,6 +1134,7 @@ CDVDVideoCodec::VCReturn CDecoder::Check(AVCodecContext* avctx) if(status.vc1.bStatus) CLog::LogFunction(LOGWARNING, "DXVA", "decoder problem of status %d with %d.", status.vc1.bStatus, status.vc1.bBufType); } +#endif return CDVDVideoCodec::VC_NONE; } diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt b/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt index 83d106616f..ca63c491cd 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt +++ b/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt @@ -21,7 +21,7 @@ set(HEADERS BaseRenderer.h RenderManager.h DebugRenderer.h) -if(CORE_SYSTEM_NAME STREQUAL windows) +if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore) list(APPEND SOURCES WinRenderer.cpp WinRenderBuffer.cpp OverlayRendererDX.cpp) diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt index 7148da2b58..54f7616aaf 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt +++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/CMakeLists.txt @@ -1,4 +1,4 @@ -if(CORE_SYSTEM_NAME STREQUAL windows) +if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore) list(APPEND SOURCES DXVAHD.cpp) list(APPEND HEADERS DXVAHD.h) endif() diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/CMakeLists.txt b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/CMakeLists.txt index ab6b1bc0dc..9b3348b8a9 100644 --- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/CMakeLists.txt +++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/CMakeLists.txt @@ -6,7 +6,7 @@ set(HEADERS ConvolutionKernels.h dither.h ShaderFormats.h) -if(CORE_SYSTEM_NAME STREQUAL windows) +if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore) list(APPEND SOURCES WinVideoFilter.cpp) list(APPEND HEADERS WinVideoFilter.h) endif() |