API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Feb 27th, 2014
367
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 173.23 KB | None | 0 0
raw download clone embed print report
  1. project/VS2010Express/XBMC.vcxproj | 166 +--
  2. project/VS2010Express/XBMC.vcxproj.filters | 1093 ++++++++++----------
  3. xbmc/Application.cpp | 34 +-
  4. xbmc/cores/DSPlayer/FGFilter.cpp | 10 +-
  5. xbmc/cores/DSPlayer/FGLoader.cpp | 10 +-
  6. xbmc/cores/DSPlayer/FGLoader.h | 2 +-
  7. xbmc/cores/DSPlayer/Filters/AllocatorCommon.cpp | 28 +-
  8. xbmc/cores/DSPlayer/Filters/AllocatorCommon.h | 1 +
  9. .../DSPlayer/Filters/madVRAllocatorPresenter.cpp | 277 +++++
  10. .../DSPlayer/Filters/madVRAllocatorPresenter.h | 117 +++
  11. xbmc/cores/DSPlayer/Filters/madVRTestPattern.cpp | 214 ++++
  12. xbmc/cores/DSPlayer/Filters/madVRTestPattern.h | 246 +++++
  13. xbmc/cores/DSPlayer/Filters/mvrInterfaces.h | 720 +++++++++++++
  14. xbmc/cores/DSPlayer/GraphFilters.cpp | 1 +
  15. xbmc/cores/DSPlayer/GraphFilters.h | 11 +-
  16. xbmc/cores/DSPlayer/IPaintCallback.h | 10 +-
  17. xbmc/cores/DSPlayer/moreuuids.h | 5 +-
  18. xbmc/cores/playercorefactory/PlayerCoreFactory.cpp | 14 +-
  19. xbmc/rendering/dx/RenderSystemDX.cpp | 12 +-
  20. 19 files changed, 2332 insertions(+), 639 deletions(-)
  21.  
  22. diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
  23. index 3aba3ea..58388d9 100644
  24. --- a/project/VS2010Express/XBMC.vcxproj
  25. +++ b/project/VS2010Express/XBMC.vcxproj
  26. @@ -369,7 +369,7 @@
  27. <ClCompile Include="..\..\xbmc\addons\Skin.cpp" />
  28. <ClCompile Include="..\..\xbmc\Application.cpp" />
  29. <ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" />
  30. - <ClCompile Include="..\..\xbmc\AppParamParser.cpp" />
  31. + <ClCompile Include="..\..\xbmc\AppParamParser.cpp" />
  32. <ClCompile Include="..\..\xbmc\Autorun.cpp" />
  33. <ClCompile Include="..\..\xbmc\AutoSwitch.cpp" />
  34. <ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" />
  35. @@ -412,6 +412,7 @@
  36. <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\asyncrdr.cpp" />
  37. <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\DX9AllocatorPresenter.cpp" />
  38. <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\EVRAllocatorPresenter.cpp" />
  39. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\madVRAllocatorPresenter.cpp" />
  40. <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\RendererSettings.cpp" />
  41. <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\VMR9AllocatorPresenter.cpp" />
  42. <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileReader.cpp" />
  43. @@ -495,9 +496,9 @@
  44. <ClCompile Include="..\..\xbmc\filesystem\CurlFile.cpp" />
  45. <ClCompile Include="..\..\xbmc\filesystem\DAAPDirectory.cpp" />
  46. <ClCompile Include="..\..\xbmc\filesystem\DAAPFile.cpp" />
  47. - <ClCompile Include="..\..\xbmc\filesystem\DAVCommon.cpp" />
  48. + <ClCompile Include="..\..\xbmc\filesystem\DAVCommon.cpp" />
  49. <ClCompile Include="..\..\xbmc\filesystem\DAVDirectory.cpp" />
  50. - <ClCompile Include="..\..\xbmc\filesystem\DAVFile.cpp" />
  51. + <ClCompile Include="..\..\xbmc\filesystem\DAVFile.cpp" />
  52. <ClCompile Include="..\..\xbmc\filesystem\Directory.cpp" />
  53. <ClCompile Include="..\..\xbmc\filesystem\DirectoryCache.cpp" />
  54. <ClCompile Include="..\..\xbmc\filesystem\DirectoryFactory.cpp" />
  55. @@ -529,7 +530,7 @@
  56. <ClCompile Include="..\..\xbmc\filesystem\MultiPathDirectory.cpp" />
  57. <ClCompile Include="..\..\xbmc\filesystem\MultiPathFile.cpp" />
  58. <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.cpp" />
  59. - <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp" />
  60. + <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp" />
  61. <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseFile.cpp" />
  62. <ClCompile Include="..\..\xbmc\filesystem\MusicFileDirectory.cpp" />
  63. <ClCompile Include="..\..\xbmc\filesystem\MusicSearchDirectory.cpp" />
  64. @@ -606,7 +607,7 @@
  65. <ClCompile Include="..\..\xbmc\filesystem\UPnPDirectory.cpp" />
  66. <ClCompile Include="..\..\xbmc\filesystem\UPnPFile.cpp" />
  67. <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory.cpp" />
  68. - <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp" />
  69. + <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp" />
  70. <ClCompile Include="..\..\xbmc\filesystem\windows\WINFileSMB.cpp" />
  71. <ClCompile Include="..\..\xbmc\filesystem\windows\WINSMBDirectory.cpp" />
  72. <ClCompile Include="..\..\xbmc\filesystem\VirtualDirectory.cpp" />
  73. @@ -620,7 +621,7 @@
  74. <ClCompile Include="..\..\xbmc\GUIInfoManager.cpp" />
  75. <ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
  76. <ClCompile Include="..\..\xbmc\guilib\AnimatedGif.cpp" />
  77. - <ClCompile Include="..\..\xbmc\guilib\cximage.cpp" />
  78. + <ClCompile Include="..\..\xbmc\guilib\cximage.cpp" />
  79. <ClCompile Include="..\..\xbmc\guilib\D3DResource.cpp" />
  80. <ClCompile Include="..\..\xbmc\guilib\DDSImage.cpp" />
  81. <ClCompile Include="..\..\xbmc\guilib\DirectXGraphics.cpp" />
  82. @@ -706,7 +707,7 @@
  83. <ClCompile Include="..\..\xbmc\guilib\GUIWindow.cpp" />
  84. <ClCompile Include="..\..\xbmc\guilib\GUIWindowManager.cpp" />
  85. <ClCompile Include="..\..\xbmc\guilib\GUIWrappingListContainer.cpp" />
  86. - <ClCompile Include="..\..\xbmc\guilib\imagefactory.cpp" />
  87. + <ClCompile Include="..\..\xbmc\guilib\imagefactory.cpp" />
  88. <ClCompile Include="..\..\xbmc\guilib\IWindowManagerCallback.cpp" />
  89. <ClCompile Include="..\..\xbmc\guilib\JpegIO.cpp" />
  90. <ClCompile Include="..\..\xbmc\guilib\Key.cpp" />
  91. @@ -737,9 +738,9 @@
  92. <ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp" />
  93. <ClCompile Include="..\..\xbmc\input\KeyboardStat.cpp" />
  94. <ClCompile Include="..\..\xbmc\input\MouseStat.cpp" />
  95. - <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.cpp" />
  96. - <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.cpp" />
  97. - <ClCompile Include="..\..\xbmc\input\touch\ITouchInputHandling.cpp" />
  98. + <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.cpp" />
  99. + <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.cpp" />
  100. + <ClCompile Include="..\..\xbmc\input\touch\ITouchInputHandling.cpp" />
  101. <ClCompile Include="..\..\xbmc\input\windows\IRServerSuite.cpp" />
  102. <ClCompile Include="..\..\xbmc\input\windows\IrssMessage.cpp" />
  103. <ClCompile Include="..\..\xbmc\input\windows\WINJoystick.cpp" />
  104. @@ -877,10 +878,10 @@
  105. <ClCompile Include="..\..\xbmc\network\UdpClient.cpp" />
  106. <ClCompile Include="..\..\xbmc\network\upnp\UPnP.cpp" />
  107. <ClCompile Include="..\..\xbmc\network\upnp\UPnPInternal.cpp" />
  108. - <ClCompile Include="..\..\xbmc\network\upnp\UPnPPlayer.cpp" />
  109. + <ClCompile Include="..\..\xbmc\network\upnp\UPnPPlayer.cpp" />
  110. <ClCompile Include="..\..\xbmc\network\upnp\UPnPRenderer.cpp" />
  111. <ClCompile Include="..\..\xbmc\network\upnp\UPnPServer.cpp" />
  112. - <ClCompile Include="..\..\xbmc\network\upnp\UPnPSettings.cpp" />
  113. + <ClCompile Include="..\..\xbmc\network\upnp\UPnPSettings.cpp" />
  114. <ClCompile Include="..\..\xbmc\network\WebServer.cpp" />
  115. <ClCompile Include="..\..\xbmc\network\websocket\WebSocket.cpp" />
  116. <ClCompile Include="..\..\xbmc\network\websocket\WebSocketManager.cpp" />
  117. @@ -895,7 +896,7 @@
  118. <ClCompile Include="..\..\xbmc\PartyModeManager.cpp" />
  119. <ClCompile Include="..\..\xbmc\PasswordManager.cpp" />
  120. <ClCompile Include="..\..\xbmc\peripherals\bus\PeripheralBus.cpp" />
  121. - <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.cpp" />
  122. + <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.cpp" />
  123. <ClCompile Include="..\..\xbmc\peripherals\bus\win32\PeripheralBusUSB.cpp" />
  124. <ClCompile Include="..\..\xbmc\peripherals\devices\Peripheral.cpp" />
  125. <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralBluetooth.cpp" />
  126. @@ -931,11 +932,11 @@
  127. <ClCompile Include="..\..\xbmc\powermanagement\DPMSSupport.cpp" />
  128. <ClCompile Include="..\..\xbmc\powermanagement\PowerManager.cpp" />
  129. <ClCompile Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.cpp" />
  130. - <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.cpp" />
  131. - <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.cpp" />
  132. - <ClCompile Include="..\..\xbmc\profiles\Profile.cpp" />
  133. - <ClCompile Include="..\..\xbmc\profiles\ProfilesManager.cpp" />
  134. - <ClCompile Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.cpp" />
  135. + <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.cpp" />
  136. + <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.cpp" />
  137. + <ClCompile Include="..\..\xbmc\profiles\Profile.cpp" />
  138. + <ClCompile Include="..\..\xbmc\profiles\ProfilesManager.cpp" />
  139. + <ClCompile Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.cpp" />
  140. <ClCompile Include="..\..\xbmc\programs\GUIViewStatePrograms.cpp" />
  141. <ClCompile Include="..\..\xbmc\programs\GUIWindowPrograms.cpp" />
  142. <ClCompile Include="..\..\xbmc\pvr\addons\PVRClient.cpp" />
  143. @@ -985,20 +986,20 @@
  144. <ClCompile Include="..\..\xbmc\rendering\RenderSystem.cpp" />
  145. <ClCompile Include="..\..\xbmc\SectionLoader.cpp" />
  146. <ClCompile Include="..\..\xbmc\settings\AdvancedSettings.cpp" />
  147. - <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.cpp" />
  148. - <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.cpp" />
  149. - <ClCompile Include="..\..\xbmc\settings\DisplaySettings.cpp" />
  150. + <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.cpp" />
  151. + <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.cpp" />
  152. + <ClCompile Include="..\..\xbmc\settings\DisplaySettings.cpp" />
  153. <ClCompile Include="..\..\xbmc\settings\GUISettings.cpp" />
  154. - <ClCompile Include="..\..\xbmc\settings\MediaSettings.cpp" />
  155. - <ClCompile Include="..\..\xbmc\settings\MediaSourceSettings.cpp" />
  156. + <ClCompile Include="..\..\xbmc\settings\MediaSettings.cpp" />
  157. + <ClCompile Include="..\..\xbmc\settings\MediaSourceSettings.cpp" />
  158. <ClCompile Include="..\..\xbmc\settings\Settings.cpp" />
  159. - <ClCompile Include="..\..\xbmc\settings\SkinSettings.cpp" />
  160. + <ClCompile Include="..\..\xbmc\settings\SkinSettings.cpp" />
  161. <ClCompile Include="..\..\xbmc\settings\VideoSettings.cpp" />
  162. - <ClCompile Include="..\..\xbmc\settings\windows\GUISettingControls.cpp" />
  163. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettings.cpp" />
  164. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.cpp" />
  165. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.cpp" />
  166. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.cpp" />
  167. + <ClCompile Include="..\..\xbmc\settings\windows\GUISettingControls.cpp" />
  168. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettings.cpp" />
  169. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.cpp" />
  170. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.cpp" />
  171. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.cpp" />
  172. <ClCompile Include="..\..\xbmc\storage\AutorunMediaJob.cpp" />
  173. <ClCompile Include="..\..\xbmc\storage\cdioSupport.cpp" />
  174. <ClCompile Include="..\..\xbmc\storage\IoSupport.cpp" />
  175. @@ -1040,7 +1041,7 @@
  176. <ClCompile Include="..\..\xbmc\TextureCacheJob.cpp" />
  177. <ClCompile Include="..\..\xbmc\TextureDatabase.cpp" />
  178. <ClCompile Include="..\..\xbmc\DatabaseManager.cpp" />
  179. - <ClInclude Include="..\..\xbmc\AppParamParser.h" />
  180. + <ClInclude Include="..\..\xbmc\AppParamParser.h" />
  181. <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEAudioFormat.h" />
  182. <ClInclude Include="..\..\xbmc\cores\AudioEngine\AEFactory.h" />
  183. <ClInclude Include="..\..\xbmc\cores\AudioEngine\AESinkFactory.h" />
  184. @@ -1097,6 +1098,7 @@
  185. <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowDecVideo.h" />
  186. <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowEnc.h" />
  187. <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowParamsEnum.h" />
  188. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\madVRAllocatorPresenter.h" />
  189. <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\RendererSettings.h" />
  190. <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\VMR9AllocatorPresenter.h" />
  191. <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileReader.h" />
  192. @@ -1126,25 +1128,25 @@
  193. <ClInclude Include="..\..\xbmc\DbUrl.h" />
  194. <ClInclude Include="..\..\xbmc\dialogs\GUIDialogMediaFilter.h" />
  195. <ClInclude Include="..\..\xbmc\filesystem\HTTPFile.h" />
  196. - <ClInclude Include="..\..\xbmc\filesystem\DAVCommon.h" />
  197. - <ClInclude Include="..\..\xbmc\filesystem\DAVFile.h" />
  198. + <ClInclude Include="..\..\xbmc\filesystem\DAVCommon.h" />
  199. + <ClInclude Include="..\..\xbmc\filesystem\DAVFile.h" />
  200. <ClInclude Include="..\..\xbmc\filesystem\ImageFile.h" />
  201. - <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h" />
  202. - <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h" />
  203. + <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h" />
  204. + <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h" />
  205. <ClInclude Include="..\..\xbmc\filesystem\windows\WINFileSMB.h" />
  206. <ClInclude Include="..\..\xbmc\filesystem\windows\WINSMBDirectory.h" />
  207. - <ClInclude Include="..\..\xbmc\guilib\cximage.h" />
  208. + <ClInclude Include="..\..\xbmc\guilib\cximage.h" />
  209. <ClInclude Include="..\..\xbmc\guilib\GUIKeyboard.h" />
  210. <ClInclude Include="..\..\xbmc\guilib\GUIKeyboardFactory.h" />
  211. - <ClInclude Include="..\..\xbmc\guilib\iimage.h" />
  212. - <ClInclude Include="..\..\xbmc\guilib\imagefactory.h" />
  213. - <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.h" />
  214. - <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.h" />
  215. - <ClInclude Include="..\..\xbmc\input\touch\generic\IGenericTouchGestureDetector.h" />
  216. - <ClInclude Include="..\..\xbmc\input\touch\ITouchActionHandler.h" />
  217. - <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandler.h" />
  218. - <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandling.h" />
  219. - <ClInclude Include="..\..\xbmc\input\touch\TouchTypes.h" />
  220. + <ClInclude Include="..\..\xbmc\guilib\iimage.h" />
  221. + <ClInclude Include="..\..\xbmc\guilib\imagefactory.h" />
  222. + <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.h" />
  223. + <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.h" />
  224. + <ClInclude Include="..\..\xbmc\input\touch\generic\IGenericTouchGestureDetector.h" />
  225. + <ClInclude Include="..\..\xbmc\input\touch\ITouchActionHandler.h" />
  226. + <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandler.h" />
  227. + <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandling.h" />
  228. + <ClInclude Include="..\..\xbmc\input\touch\TouchTypes.h" />
  229. <ClInclude Include="..\..\xbmc\input\windows\WINJoystick.h" />
  230. <ClInclude Include="..\..\xbmc\interfaces\json-rpc\PVROperations.h" />
  231. <ClInclude Include="..\..\xbmc\interfaces\legacy\Addon.h" />
  232. @@ -1189,29 +1191,29 @@
  233. <ClInclude Include="..\..\xbmc\interfaces\python\PyContext.h" />
  234. <ClInclude Include="..\..\xbmc\interfaces\python\pythreadstate.h" />
  235. <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h" />
  236. - <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.h" />
  237. - <ClInclude Include="..\..\xbmc\network\upnp\UPnPSettings.h" />
  238. - <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.h" />
  239. - <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.h" />
  240. - <ClInclude Include="..\..\xbmc\profiles\Profile.h" />
  241. - <ClInclude Include="..\..\xbmc\profiles\ProfilesManager.h" />
  242. - <ClInclude Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.h" />
  243. - <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.h" />
  244. - <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.h" />
  245. - <ClInclude Include="..\..\xbmc\settings\DisplaySettings.h" />
  246. - <ClInclude Include="..\..\xbmc\settings\ISettingsHandler.h" />
  247. - <ClInclude Include="..\..\xbmc\settings\ISubSettings.h" />
  248. - <ClInclude Include="..\..\xbmc\settings\MediaSettings.h" />
  249. - <ClInclude Include="..\..\xbmc\settings\MediaSourceSettings.h" />
  250. - <ClInclude Include="..\..\xbmc\settings\SkinSettings.h" />
  251. - <ClInclude Include="..\..\xbmc\settings\windows\GUISettingControls.h" />
  252. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettings.h" />
  253. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.h" />
  254. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.h" />
  255. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.h" />
  256. - <ClInclude Include="..\..\xbmc\utils\IRssObserver.h" />
  257. - <ClInclude Include="..\..\xbmc\utils\RssManager.h" />
  258. - <ClInclude Include="..\..\xbmc\utils\Vector.h" />
  259. + <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.h" />
  260. + <ClInclude Include="..\..\xbmc\network\upnp\UPnPSettings.h" />
  261. + <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.h" />
  262. + <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.h" />
  263. + <ClInclude Include="..\..\xbmc\profiles\Profile.h" />
  264. + <ClInclude Include="..\..\xbmc\profiles\ProfilesManager.h" />
  265. + <ClInclude Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.h" />
  266. + <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.h" />
  267. + <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.h" />
  268. + <ClInclude Include="..\..\xbmc\settings\DisplaySettings.h" />
  269. + <ClInclude Include="..\..\xbmc\settings\ISettingsHandler.h" />
  270. + <ClInclude Include="..\..\xbmc\settings\ISubSettings.h" />
  271. + <ClInclude Include="..\..\xbmc\settings\MediaSettings.h" />
  272. + <ClInclude Include="..\..\xbmc\settings\MediaSourceSettings.h" />
  273. + <ClInclude Include="..\..\xbmc\settings\SkinSettings.h" />
  274. + <ClInclude Include="..\..\xbmc\settings\windows\GUISettingControls.h" />
  275. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettings.h" />
  276. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.h" />
  277. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.h" />
  278. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.h" />
  279. + <ClInclude Include="..\..\xbmc\utils\IRssObserver.h" />
  280. + <ClInclude Include="..\..\xbmc\utils\RssManager.h" />
  281. + <ClInclude Include="..\..\xbmc\utils\Vector.h" />
  282. <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h" />
  283. <ClInclude Include="..\..\xbmc\interfaces\python\swig.h" />
  284. <ClInclude Include="..\..\xbmc\interfaces\python\XBPython.h" />
  285. @@ -1225,7 +1227,7 @@
  286. <ClInclude Include="..\..\xbmc\network\DllLibShairplay.h" />
  287. <ClInclude Include="..\..\xbmc\network\upnp\UPnP.h" />
  288. <ClInclude Include="..\..\xbmc\network\upnp\UPnPInternal.h" />
  289. - <ClInclude Include="..\..\xbmc\network\upnp\UPnPPlayer.h" />
  290. + <ClInclude Include="..\..\xbmc\network\upnp\UPnPPlayer.h" />
  291. <ClInclude Include="..\..\xbmc\network\upnp\UPnPRenderer.h" />
  292. <ClInclude Include="..\..\xbmc\network\upnp\UPnPServer.h" />
  293. <ClInclude Include="..\..\xbmc\network\websocket\WebSocket.h" />
  294. @@ -1347,7 +1349,7 @@
  295. </ClInclude>
  296. <ClInclude Include="..\..\xbmc\interfaces\json-rpc\AddonsOperations.h" />
  297. <ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
  298. - <ClCompile Include="..\..\xbmc\utils\RssManager.cpp" />
  299. + <ClCompile Include="..\..\xbmc\utils\RssManager.cpp" />
  300. <ClCompile Include="..\..\xbmc\utils\test\TestUrlOptions.cpp">
  301. <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">true</ExcludedFromBuild>
  302. <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug (OpenGL)|Win32'">true</ExcludedFromBuild>
  303. @@ -1355,8 +1357,8 @@
  304. <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release (OpenGL)|Win32'">true</ExcludedFromBuild>
  305. <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">true</ExcludedFromBuild>
  306. </ClCompile>
  307. - <ClCompile Include="..\..\xbmc\utils\Vector.cpp" />
  308. - <ClCompile Include="..\..\xbmc\video\PlayerController.cpp" />
  309. + <ClCompile Include="..\..\xbmc\utils\Vector.cpp" />
  310. + <ClCompile Include="..\..\xbmc\video\PlayerController.cpp" />
  311. <ClCompile Include="..\..\xbmc\video\VideoThumbLoader.cpp" />
  312. <ClCompile Include="..\..\xbmc\music\MusicThumbLoader.cpp" />
  313. <ClCompile Include="..\..\xbmc\ThumbnailCache.cpp" />
  314. @@ -1775,10 +1777,10 @@
  315. <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoBase.cpp" />
  316. <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoNav.cpp" />
  317. <ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.cpp" />
  318. - <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp" />
  319. - <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp" />
  320. - <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp" />
  321. - <ClCompile Include="..\..\xbmc\view\ViewStateSettings.cpp" />
  322. + <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp" />
  323. + <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp" />
  324. + <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp" />
  325. + <ClCompile Include="..\..\xbmc\view\ViewStateSettings.cpp" />
  326. <ClCompile Include="..\..\xbmc\win32\pch.cpp">
  327. <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Create</PrecompiledHeader>
  328. <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Create</PrecompiledHeader>
  329. @@ -2471,7 +2473,7 @@
  330. <ClInclude Include="..\..\xbmc\TextureDatabase.h" />
  331. <ClInclude Include="..\..\xbmc\DatabaseManager.h" />
  332. <ClInclude Include="..\..\xbmc\ThumbLoader.h" />
  333. - <ClInclude Include="..\..\xbmc\video\PlayerController.h" />
  334. + <ClInclude Include="..\..\xbmc\video\PlayerController.h" />
  335. <ClInclude Include="..\..\xbmc\video\VideoThumbLoader.h" />
  336. <ClInclude Include="..\..\xbmc\music\MusicThumbLoader.h" />
  337. <ClInclude Include="..\..\xbmc\ThumbnailCache.h" />
  338. @@ -2582,11 +2584,11 @@
  339. <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoBase.h" />
  340. <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoNav.h" />
  341. <ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.h" />
  342. - <ClInclude Include="..\..\xbmc\view\GUIViewControl.h" />
  343. - <ClInclude Include="..\..\xbmc\view\GUIViewState.h" />
  344. - <ClInclude Include="..\..\xbmc\view\ViewDatabase.h" />
  345. - <ClInclude Include="..\..\xbmc\view\ViewState.h" />
  346. - <ClInclude Include="..\..\xbmc\view\ViewStateSettings.h" />
  347. + <ClInclude Include="..\..\xbmc\view\GUIViewControl.h" />
  348. + <ClInclude Include="..\..\xbmc\view\GUIViewState.h" />
  349. + <ClInclude Include="..\..\xbmc\view\ViewDatabase.h" />
  350. + <ClInclude Include="..\..\xbmc\view\ViewState.h" />
  351. + <ClInclude Include="..\..\xbmc\view\ViewStateSettings.h" />
  352. <ClInclude Include="..\..\xbmc\win32\pch.h" />
  353. <ClInclude Include="..\..\xbmc\win32\PlatformDefs.h" />
  354. <ClInclude Include="..\..\xbmc\XBDateTime.h" />
  355. @@ -3050,4 +3052,4 @@
  356. </VisualStudio>
  357. </ProjectExtensions>
  358. <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
  359. -</Project>
  360. +</Project>
  361. \ No newline at end of file
  362. diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
  363. index ec51b1a..e2e8828 100644
  364. --- a/project/VS2010Express/XBMC.vcxproj.filters
  365. +++ b/project/VS2010Express/XBMC.vcxproj.filters
  366. @@ -277,62 +277,63 @@
  367. <Filter Include="interfaces\python\test">
  368. <UniqueIdentifier>{0a84b5ee-2ad4-4ae2-9a8d-fc585c6d8aae}</UniqueIdentifier>
  369. </Filter>
  370. - <Filter Include="view">
  371. - <UniqueIdentifier>{90f512bb-8cda-4f04-b938-4f48d29bc82a}</UniqueIdentifier>
  372. - </Filter> <Filter Include="cores\DSPlayer">
  373. - <UniqueIdentifier>{8b65ff5a-9862-42bc-bf92-b5cf22b9c12a}</UniqueIdentifier>
  374. - </Filter>
  375. - <Filter Include="settings\dialogs">
  376. - <UniqueIdentifier>{38264422-e35f-427f-8d3d-27bc075b9bdd}</UniqueIdentifier>
  377. - </Filter>
  378. - <Filter Include="settings\windows">
  379. - <UniqueIdentifier>{1a1eb956-43d1-4709-9467-ce471d54941d}</UniqueIdentifier>
  380. - </Filter>
  381. - <Filter Include="profiles">
  382. - <UniqueIdentifier>{e0e6a2e7-683d-442f-bbd1-bc4e0ecd140a}</UniqueIdentifier>
  383. - </Filter>
  384. - <Filter Include="profiles\dialogs">
  385. - <UniqueIdentifier>{e658a9f4-98f8-4403-aa85-a5ed7ec67868}</UniqueIdentifier>
  386. - </Filter>
  387. - <Filter Include="profiles\windows">
  388. - <UniqueIdentifier>{b5a6d872-7e56-4976-81c5-47baad252337}</UniqueIdentifier>
  389. - </Filter>
  390. - <Filter Include="input\touch">
  391. - <UniqueIdentifier>{4e236b17-3720-4ed8-89af-90cb86bf9b03}</UniqueIdentifier>
  392. - </Filter>
  393. - <Filter Include="input\touch\generic">
  394. - <UniqueIdentifier>{d062c356-66f2-49e7-9510-b216701d2298}</UniqueIdentifier>
  395. - </Filter>
  396. - <Filter Include="cores\DSPlayer\FilterCoreFactory">
  397. - <UniqueIdentifier>{e51e3d8c-ee41-4a89-b895-7855b6655146}</UniqueIdentifier>
  398. - </Filter>
  399. - <Filter Include="cores\DSPlayer\Filters">
  400. - <UniqueIdentifier>{82fef0c7-f356-48c8-9bd3-f232311e770a}</UniqueIdentifier>
  401. - </Filter>
  402. - <Filter Include="cores\DSPlayer\Interfaces">
  403. - <UniqueIdentifier>{63ced100-c60a-4c01-8e20-cef3c67e1925}</UniqueIdentifier>
  404. - </Filter>
  405. - <Filter Include="cores\DSPlayer\Shaders">
  406. - <UniqueIdentifier>{cebe8028-82be-4cec-b3de-0d87a95cb2b0}</UniqueIdentifier>
  407. - </Filter>
  408. - <Filter Include="cores\DSPlayer\Utils">
  409. - <UniqueIdentifier>{11b4988a-2f71-4471-902a-81e3230df77c}</UniqueIdentifier>
  410. - </Filter>
  411. - <Filter Include="cores\DSPlayer\Interfaces\ffdshow">
  412. - <UniqueIdentifier>{2824d426-eef9-4287-a19d-89340415fef4}</UniqueIdentifier>
  413. - </Filter>
  414. - <Filter Include="cores\DSPlayer\Filters\BaseClassFilters">
  415. - <UniqueIdentifier>{539077e3-65bf-4cab-b48b-01dd16a9a8a6}</UniqueIdentifier>
  416. - </Filter>
  417. - <Filter Include="cores\DSPlayer\Filters\Include">
  418. - <UniqueIdentifier>{a7d6b73c-f765-44b6-aff2-140a5903b128}</UniqueIdentifier>
  419. - </Filter>
  420. - <Filter Include="cores\DSPlayer\Filters\Video Renderers">
  421. - <UniqueIdentifier>{3b6b6bfa-49fe-40c8-abe6-4b14e46d2257}</UniqueIdentifier>
  422. - </Filter>
  423. - <Filter Include="cores\DSPlayer\Filters\Source">
  424. - <UniqueIdentifier>{c356be07-4c7d-42dc-9a99-2beea6f8dc56}</UniqueIdentifier>
  425. - </Filter>
  426. + <Filter Include="view">
  427. + <UniqueIdentifier>{90f512bb-8cda-4f04-b938-4f48d29bc82a}</UniqueIdentifier>
  428. + </Filter>
  429. + <Filter Include="cores\DSPlayer">
  430. + <UniqueIdentifier>{8b65ff5a-9862-42bc-bf92-b5cf22b9c12a}</UniqueIdentifier>
  431. + </Filter>
  432. + <Filter Include="settings\dialogs">
  433. + <UniqueIdentifier>{38264422-e35f-427f-8d3d-27bc075b9bdd}</UniqueIdentifier>
  434. + </Filter>
  435. + <Filter Include="settings\windows">
  436. + <UniqueIdentifier>{1a1eb956-43d1-4709-9467-ce471d54941d}</UniqueIdentifier>
  437. + </Filter>
  438. + <Filter Include="profiles">
  439. + <UniqueIdentifier>{e0e6a2e7-683d-442f-bbd1-bc4e0ecd140a}</UniqueIdentifier>
  440. + </Filter>
  441. + <Filter Include="profiles\dialogs">
  442. + <UniqueIdentifier>{e658a9f4-98f8-4403-aa85-a5ed7ec67868}</UniqueIdentifier>
  443. + </Filter>
  444. + <Filter Include="profiles\windows">
  445. + <UniqueIdentifier>{b5a6d872-7e56-4976-81c5-47baad252337}</UniqueIdentifier>
  446. + </Filter>
  447. + <Filter Include="input\touch">
  448. + <UniqueIdentifier>{4e236b17-3720-4ed8-89af-90cb86bf9b03}</UniqueIdentifier>
  449. + </Filter>
  450. + <Filter Include="input\touch\generic">
  451. + <UniqueIdentifier>{d062c356-66f2-49e7-9510-b216701d2298}</UniqueIdentifier>
  452. + </Filter>
  453. + <Filter Include="cores\DSPlayer\FilterCoreFactory">
  454. + <UniqueIdentifier>{e51e3d8c-ee41-4a89-b895-7855b6655146}</UniqueIdentifier>
  455. + </Filter>
  456. + <Filter Include="cores\DSPlayer\Filters">
  457. + <UniqueIdentifier>{82fef0c7-f356-48c8-9bd3-f232311e770a}</UniqueIdentifier>
  458. + </Filter>
  459. + <Filter Include="cores\DSPlayer\Interfaces">
  460. + <UniqueIdentifier>{63ced100-c60a-4c01-8e20-cef3c67e1925}</UniqueIdentifier>
  461. + </Filter>
  462. + <Filter Include="cores\DSPlayer\Shaders">
  463. + <UniqueIdentifier>{cebe8028-82be-4cec-b3de-0d87a95cb2b0}</UniqueIdentifier>
  464. + </Filter>
  465. + <Filter Include="cores\DSPlayer\Utils">
  466. + <UniqueIdentifier>{11b4988a-2f71-4471-902a-81e3230df77c}</UniqueIdentifier>
  467. + </Filter>
  468. + <Filter Include="cores\DSPlayer\Interfaces\ffdshow">
  469. + <UniqueIdentifier>{2824d426-eef9-4287-a19d-89340415fef4}</UniqueIdentifier>
  470. + </Filter>
  471. + <Filter Include="cores\DSPlayer\Filters\BaseClassFilters">
  472. + <UniqueIdentifier>{539077e3-65bf-4cab-b48b-01dd16a9a8a6}</UniqueIdentifier>
  473. + </Filter>
  474. + <Filter Include="cores\DSPlayer\Filters\Include">
  475. + <UniqueIdentifier>{a7d6b73c-f765-44b6-aff2-140a5903b128}</UniqueIdentifier>
  476. + </Filter>
  477. + <Filter Include="cores\DSPlayer\Filters\Video Renderers">
  478. + <UniqueIdentifier>{3b6b6bfa-49fe-40c8-abe6-4b14e46d2257}</UniqueIdentifier>
  479. + </Filter>
  480. + <Filter Include="cores\DSPlayer\Filters\Source">
  481. + <UniqueIdentifier>{c356be07-4c7d-42dc-9a99-2beea6f8dc56}</UniqueIdentifier>
  482. + </Filter>
  483. </ItemGroup>
  484. <ItemGroup>
  485. <ClCompile Include="..\..\xbmc\win32\pch.cpp">
  486. @@ -2914,198 +2915,208 @@
  487. <ClCompile Include="..\..\xbmc\interfaces\python\PyContext.cpp">
  488. <Filter>interfaces\python</Filter>
  489. </ClCompile>
  490. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\ChaptersManager.cpp">
  491. - <Filter>cores\DSPlayer</Filter>
  492. - </ClCompile>
  493. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSGraph.cpp">
  494. - <Filter>cores\DSPlayer</Filter>
  495. - </ClCompile>
  496. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSPlayer.cpp">
  497. - <Filter>cores\DSPlayer</Filter>
  498. - </ClCompile>
  499. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSPropertyPage.cpp">
  500. - <Filter>cores\DSPlayer</Filter>
  501. - </ClCompile>
  502. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGFilter.cpp">
  503. - <Filter>cores\DSPlayer</Filter>
  504. - </ClCompile>
  505. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGLoader.cpp">
  506. - <Filter>cores\DSPlayer</Filter>
  507. - </ClCompile>
  508. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGManager.cpp">
  509. - <Filter>cores\DSPlayer</Filter>
  510. - </ClCompile>
  511. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGManager2.cpp">
  512. - <Filter>cores\DSPlayer</Filter>
  513. - </ClCompile>
  514. - <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.cpp">
  515. - <Filter>peripherals\bus</Filter>
  516. - </ClCompile>
  517. - <ClCompile Include="..\..\xbmc\network\upnp\UPnPSettings.cpp">
  518. - <Filter>network\upnp</Filter>
  519. - </ClCompile>
  520. - <ClCompile Include="..\..\xbmc\AppParamParser.cpp" />
  521. - <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.cpp">
  522. - <Filter>settings\dialogs</Filter>
  523. - </ClCompile>
  524. - <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.cpp">
  525. - <Filter>settings\dialogs</Filter>
  526. - </ClCompile>
  527. - <ClCompile Include="..\..\xbmc\settings\windows\GUISettingControls.cpp">
  528. - <Filter>settings\windows</Filter>
  529. - </ClCompile>
  530. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettings.cpp">
  531. - <Filter>settings\windows</Filter>
  532. - </ClCompile>
  533. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.cpp">
  534. - <Filter>settings\windows</Filter>
  535. - </ClCompile>
  536. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.cpp">
  537. - <Filter>settings\windows</Filter>
  538. - </ClCompile>
  539. - <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.cpp">
  540. - <Filter>settings\windows</Filter>
  541. - </ClCompile>
  542. - <ClCompile Include="..\..\xbmc\utils\RssManager.cpp">
  543. - <Filter>utils</Filter>
  544. - </ClCompile>
  545. - <ClCompile Include="..\..\xbmc\settings\SkinSettings.cpp">
  546. - <Filter>settings</Filter>
  547. - </ClCompile>
  548. - <ClCompile Include="..\..\xbmc\settings\MediaSourceSettings.cpp">
  549. - <Filter>settings</Filter>
  550. - </ClCompile>
  551. - <ClCompile Include="..\..\xbmc\view\ViewStateSettings.cpp">
  552. - <Filter>view</Filter>
  553. - </ClCompile>
  554. - <ClCompile Include="..\..\xbmc\settings\MediaSettings.cpp">
  555. - <Filter>settings</Filter>
  556. - </ClCompile>
  557. - <ClCompile Include="..\..\xbmc\settings\DisplaySettings.cpp">
  558. - <Filter>settings</Filter>
  559. - </ClCompile>
  560. - <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.cpp">
  561. - <Filter>profiles\dialogs</Filter>
  562. - </ClCompile>
  563. - <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.cpp">
  564. - <Filter>profiles\dialogs</Filter>
  565. - </ClCompile>
  566. - <ClCompile Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.cpp">
  567. - <Filter>profiles\windows</Filter>
  568. - </ClCompile>
  569. - <ClCompile Include="..\..\xbmc\profiles\Profile.cpp">
  570. - <Filter>profiles</Filter>
  571. - </ClCompile>
  572. - <ClCompile Include="..\..\xbmc\profiles\ProfilesManager.cpp">
  573. - <Filter>profiles</Filter>
  574. - </ClCompile>
  575. - <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.cpp">
  576. - <Filter>input\touch\generic</Filter>
  577. - </ClCompile>
  578. - <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.cpp">
  579. - <Filter>input\touch\generic</Filter>
  580. - </ClCompile>
  581. - <ClCompile Include="..\..\xbmc\input\touch\ITouchInputHandling.cpp">
  582. - <Filter>input\touch</Filter>
  583. - </ClCompile>
  584. - <ClCompile Include="..\..\xbmc\utils\Vector.cpp">
  585. - <Filter>utils</Filter>
  586. - </ClCompile>
  587. - <ClCompile Include="..\..\xbmc\video\PlayerController.cpp">
  588. - <Filter>video</Filter>
  589. - </ClCompile>
  590. - <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp">
  591. - <Filter>filesystem\VideoDatabaseDirectory</Filter>
  592. - </ClCompile>
  593. - <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp">
  594. - <Filter>filesystem\MusicDatabaseDirectory</Filter>
  595. - </ClCompile>
  596. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\GraphFilters.cpp">
  597. - <Filter>cores\DSPlayer</Filter>
  598. - </ClCompile>
  599. -
  600. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\StreamsManager.cpp">
  601. - <Filter>cores\DSPlayer</Filter>
  602. - </ClCompile>
  603. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\AudioEnumerator.cpp">
  604. - <Filter>cores\DSPlayer\Utils</Filter>
  605. - </ClCompile>
  606. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\DSTemplate.cpp">
  607. - <Filter>cores\DSPlayer\Utils</Filter>
  608. - </ClCompile>
  609. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\IPinHook.cpp">
  610. - <Filter>cores\DSPlayer\Utils</Filter>
  611. - </ClCompile>
  612. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\MacrovisionKicker.cpp">
  613. - <Filter>cores\DSPlayer\Utils</Filter>
  614. - </ClCompile>
  615. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\ExternalPixelShader.cpp">
  616. - <Filter>cores\DSPlayer\Shaders</Filter>
  617. - </ClCompile>
  618. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\PixelShaderCompiler.cpp">
  619. - <Filter>cores\DSPlayer\Shaders</Filter>
  620. - </ClCompile>
  621. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\PixelShaderList.cpp">
  622. - <Filter>cores\DSPlayer\Shaders</Filter>
  623. - </ClCompile>
  624. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\ShadersSelectionRule.cpp">
  625. - <Filter>cores\DSPlayer\Shaders</Filter>
  626. - </ClCompile>
  627. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\ILogImpl.cpp">
  628. - <Filter>cores\DSPlayer\Interfaces</Filter>
  629. - </ClCompile>
  630. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\AllocatorCommon.cpp">
  631. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  632. - </ClCompile>
  633. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\DX9AllocatorPresenter.cpp">
  634. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  635. - </ClCompile>
  636. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\EVRAllocatorPresenter.cpp">
  637. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  638. - </ClCompile>
  639. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\RendererSettings.cpp">
  640. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  641. - </ClCompile>
  642. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\VMR9AllocatorPresenter.cpp">
  643. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  644. - </ClCompile>
  645. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileReader.cpp">
  646. - <Filter>cores\DSPlayer\Filters\Source</Filter>
  647. - </ClCompile>
  648. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileSource.cpp">
  649. - <Filter>cores\DSPlayer\Filters\Source</Filter>
  650. - </ClCompile>
  651. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSauth.cpp">
  652. - <Filter>cores\DSPlayer\Filters\Include</Filter>
  653. - </ClCompile>
  654. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSscramble.cpp">
  655. - <Filter>cores\DSPlayer\Filters\Include</Filter>
  656. - </ClCompile>
  657. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\DeCSSInputPin.cpp">
  658. - <Filter>cores\DSPlayer\Filters\Include</Filter>
  659. - </ClCompile>
  660. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\asyncio.cpp">
  661. - <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  662. - </ClCompile>
  663. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\asyncrdr.cpp">
  664. - <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  665. - </ClCompile>
  666. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterCoreFactory.cpp">
  667. - <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  668. - </ClCompile>
  669. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterSelectionRule.cpp">
  670. - <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  671. - </ClCompile>
  672. - <ClCompile Include="..\..\xbmc\cores\VideoRenderers\WinDsRenderer.cpp">
  673. - <Filter>cores\VideoRenderers</Filter>
  674. - </ClCompile>
  675. - <ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp" />
  676. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSInputStreamPVRManager.cpp">
  677. - <Filter>cores\DSPlayer</Filter>
  678. - </ClCompile>
  679. - <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSPlayerDatabase.cpp">
  680. - <Filter>cores\DSPlayer</Filter>
  681. - </ClCompile>
  682. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\ChaptersManager.cpp">
  683. + <Filter>cores\DSPlayer</Filter>
  684. + </ClCompile>
  685. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSGraph.cpp">
  686. + <Filter>cores\DSPlayer</Filter>
  687. + </ClCompile>
  688. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSPlayer.cpp">
  689. + <Filter>cores\DSPlayer</Filter>
  690. + </ClCompile>
  691. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSPropertyPage.cpp">
  692. + <Filter>cores\DSPlayer</Filter>
  693. + </ClCompile>
  694. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGFilter.cpp">
  695. + <Filter>cores\DSPlayer</Filter>
  696. + </ClCompile>
  697. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGLoader.cpp">
  698. + <Filter>cores\DSPlayer</Filter>
  699. + </ClCompile>
  700. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGManager.cpp">
  701. + <Filter>cores\DSPlayer</Filter>
  702. + </ClCompile>
  703. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\FGManager2.cpp">
  704. + <Filter>cores\DSPlayer</Filter>
  705. + </ClCompile>
  706. + <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.cpp">
  707. + <Filter>peripherals\bus</Filter>
  708. + </ClCompile>
  709. + <ClCompile Include="..\..\xbmc\network\upnp\UPnPSettings.cpp">
  710. + <Filter>network\upnp</Filter>
  711. + </ClCompile>
  712. + <ClCompile Include="..\..\xbmc\AppParamParser.cpp" />
  713. + <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.cpp">
  714. + <Filter>settings\dialogs</Filter>
  715. + </ClCompile>
  716. + <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.cpp">
  717. + <Filter>settings\dialogs</Filter>
  718. + </ClCompile>
  719. + <ClCompile Include="..\..\xbmc\settings\windows\GUISettingControls.cpp">
  720. + <Filter>settings\windows</Filter>
  721. + </ClCompile>
  722. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettings.cpp">
  723. + <Filter>settings\windows</Filter>
  724. + </ClCompile>
  725. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.cpp">
  726. + <Filter>settings\windows</Filter>
  727. + </ClCompile>
  728. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.cpp">
  729. + <Filter>settings\windows</Filter>
  730. + </ClCompile>
  731. + <ClCompile Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.cpp">
  732. + <Filter>settings\windows</Filter>
  733. + </ClCompile>
  734. + <ClCompile Include="..\..\xbmc\utils\RssManager.cpp">
  735. + <Filter>utils</Filter>
  736. + </ClCompile>
  737. + <ClCompile Include="..\..\xbmc\settings\SkinSettings.cpp">
  738. + <Filter>settings</Filter>
  739. + </ClCompile>
  740. + <ClCompile Include="..\..\xbmc\settings\MediaSourceSettings.cpp">
  741. + <Filter>settings</Filter>
  742. + </ClCompile>
  743. + <ClCompile Include="..\..\xbmc\view\ViewStateSettings.cpp">
  744. + <Filter>view</Filter>
  745. + </ClCompile>
  746. + <ClCompile Include="..\..\xbmc\settings\MediaSettings.cpp">
  747. + <Filter>settings</Filter>
  748. + </ClCompile>
  749. + <ClCompile Include="..\..\xbmc\settings\DisplaySettings.cpp">
  750. + <Filter>settings</Filter>
  751. + </ClCompile>
  752. + <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.cpp">
  753. + <Filter>profiles\dialogs</Filter>
  754. + </ClCompile>
  755. + <ClCompile Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.cpp">
  756. + <Filter>profiles\dialogs</Filter>
  757. + </ClCompile>
  758. + <ClCompile Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.cpp">
  759. + <Filter>profiles\windows</Filter>
  760. + </ClCompile>
  761. + <ClCompile Include="..\..\xbmc\profiles\Profile.cpp">
  762. + <Filter>profiles</Filter>
  763. + </ClCompile>
  764. + <ClCompile Include="..\..\xbmc\profiles\ProfilesManager.cpp">
  765. + <Filter>profiles</Filter>
  766. + </ClCompile>
  767. + <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.cpp">
  768. + <Filter>input\touch\generic</Filter>
  769. + </ClCompile>
  770. + <ClCompile Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.cpp">
  771. + <Filter>input\touch\generic</Filter>
  772. + </ClCompile>
  773. + <ClCompile Include="..\..\xbmc\input\touch\ITouchInputHandling.cpp">
  774. + <Filter>input\touch</Filter>
  775. + </ClCompile>
  776. + <ClCompile Include="..\..\xbmc\utils\Vector.cpp">
  777. + <Filter>utils</Filter>
  778. + </ClCompile>
  779. + <ClCompile Include="..\..\xbmc\video\PlayerController.cpp">
  780. + <Filter>video</Filter>
  781. + </ClCompile>
  782. + <ClCompile Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.cpp">
  783. + <Filter>filesystem\VideoDatabaseDirectory</Filter>
  784. + </ClCompile>
  785. + <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp">
  786. + <Filter>filesystem\MusicDatabaseDirectory</Filter>
  787. + </ClCompile>
  788. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\GraphFilters.cpp">
  789. + <Filter>cores\DSPlayer</Filter>
  790. + </ClCompile>
  791. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\StreamsManager.cpp">
  792. + <Filter>cores\DSPlayer</Filter>
  793. + </ClCompile>
  794. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\AudioEnumerator.cpp">
  795. + <Filter>cores\DSPlayer\Utils</Filter>
  796. + </ClCompile>
  797. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\DSTemplate.cpp">
  798. + <Filter>cores\DSPlayer\Utils</Filter>
  799. + </ClCompile>
  800. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\IPinHook.cpp">
  801. + <Filter>cores\DSPlayer\Utils</Filter>
  802. + </ClCompile>
  803. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Utils\MacrovisionKicker.cpp">
  804. + <Filter>cores\DSPlayer\Utils</Filter>
  805. + </ClCompile>
  806. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\ExternalPixelShader.cpp">
  807. + <Filter>cores\DSPlayer\Shaders</Filter>
  808. + </ClCompile>
  809. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\PixelShaderCompiler.cpp">
  810. + <Filter>cores\DSPlayer\Shaders</Filter>
  811. + </ClCompile>
  812. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\PixelShaderList.cpp">
  813. + <Filter>cores\DSPlayer\Shaders</Filter>
  814. + </ClCompile>
  815. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\ShadersSelectionRule.cpp">
  816. + <Filter>cores\DSPlayer\Shaders</Filter>
  817. + </ClCompile>
  818. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\ILogImpl.cpp">
  819. + <Filter>cores\DSPlayer\Interfaces</Filter>
  820. + </ClCompile>
  821. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\AllocatorCommon.cpp">
  822. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  823. + </ClCompile>
  824. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\DX9AllocatorPresenter.cpp">
  825. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  826. + </ClCompile>
  827. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\EVRAllocatorPresenter.cpp">
  828. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  829. + </ClCompile>
  830. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\RendererSettings.cpp">
  831. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  832. + </ClCompile>
  833. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\VMR9AllocatorPresenter.cpp">
  834. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  835. + </ClCompile>
  836. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileReader.cpp">
  837. + <Filter>cores\DSPlayer\Filters\Source</Filter>
  838. + </ClCompile>
  839. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileSource.cpp">
  840. + <Filter>cores\DSPlayer\Filters\Source</Filter>
  841. + </ClCompile>
  842. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSauth.cpp">
  843. + <Filter>cores\DSPlayer\Filters\Include</Filter>
  844. + </ClCompile>
  845. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSscramble.cpp">
  846. + <Filter>cores\DSPlayer\Filters\Include</Filter>
  847. + </ClCompile>
  848. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\DeCSSInputPin.cpp">
  849. + <Filter>cores\DSPlayer\Filters\Include</Filter>
  850. + </ClCompile>
  851. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\asyncio.cpp">
  852. + <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  853. + </ClCompile>
  854. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\asyncrdr.cpp">
  855. + <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  856. + </ClCompile>
  857. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterCoreFactory.cpp">
  858. + <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  859. + </ClCompile>
  860. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterSelectionRule.cpp">
  861. + <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  862. + </ClCompile>
  863. + <ClCompile Include="..\..\xbmc\cores\VideoRenderers\WinDsRenderer.cpp">
  864. + <Filter>cores\VideoRenderers</Filter>
  865. + </ClCompile>
  866. + <ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp" />
  867. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSInputStreamPVRManager.cpp">
  868. + <Filter>cores\DSPlayer</Filter>
  869. + </ClCompile>
  870. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\DSPlayerDatabase.cpp">
  871. + <Filter>cores\DSPlayer</Filter>
  872. + </ClCompile>
  873. + <ClCompile Include="..\..\xbmc\filesystem\DAVCommon.cpp" />
  874. + <ClCompile Include="..\..\xbmc\filesystem\DAVFile.cpp" />
  875. + <ClCompile Include="..\..\xbmc\guilib\cximage.cpp" />
  876. + <ClCompile Include="..\..\xbmc\guilib\imagefactory.cpp" />
  877. + <ClCompile Include="..\..\xbmc\network\upnp\UPnPPlayer.cpp" />
  878. + <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp" />
  879. + <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp" />
  880. + <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp" />
  881. + <ClCompile Include="..\..\xbmc\cores\DSPlayer\Filters\madVRAllocatorPresenter.cpp">
  882. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  883. + </ClCompile>
  884. </ItemGroup>
  885. <ItemGroup>
  886. <ClInclude Include="..\..\xbmc\win32\pch.h">
  887. @@ -5651,9 +5662,9 @@
  888. <ClInclude Include="..\..\xbmc\network\upnp\UPnPInternal.h">
  889. <Filter>network\upnp</Filter>
  890. </ClInclude>
  891. - <ClInclude Include="..\..\xbmc\network\upnp\UPnPPlayer.h">
  892. - <Filter>network\upnp</Filter>
  893. - </ClInclude>
  894. + <ClInclude Include="..\..\xbmc\network\upnp\UPnPPlayer.h">
  895. + <Filter>network\upnp</Filter>
  896. + </ClInclude>
  897. <ClInclude Include="..\..\xbmc\network\upnp\UPnPRenderer.h">
  898. <Filter>network\upnp</Filter>
  899. </ClInclude>
  900. @@ -5825,293 +5836,297 @@
  901. <ClInclude Include="..\..\xbmc\interfaces\python\PyContext.h">
  902. <Filter>interfaces\python</Filter>
  903. </ClInclude>
  904. - <ClInclude Include="..\..\xbmc\guilib\iimage.h">
  905. - <Filter>guilib</Filter>
  906. - </ClInclude>
  907. - <ClInclude Include="..\..\xbmc\guilib\imagefactory.h">
  908. - <Filter>guilib</Filter>
  909. - </ClInclude>
  910. - <ClInclude Include="..\..\xbmc\guilib\cximage.h">
  911. - <Filter>guilib</Filter>
  912. - </ClInclude>
  913. - <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h">
  914. - <Filter>music\karaoke</Filter>
  915. - </ClInclude>
  916. - <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h">
  917. - <Filter>video</Filter>
  918. - </ClInclude>
  919. - <ClInclude Include="..\..\xbmc\view\GUIViewControl.h">
  920. - <Filter>view</Filter>
  921. - </ClInclude>
  922. - <ClInclude Include="..\..\xbmc\view\GUIViewState.h">
  923. - <Filter>view</Filter>
  924. - </ClInclude>
  925. - <ClInclude Include="..\..\xbmc\view\ViewDatabase.h">
  926. - <Filter>view</Filter>
  927. - </ClInclude>
  928. - <ClInclude Include="..\..\xbmc\view\ViewState.h">
  929. - <Filter>view</Filter>
  930. - </ClInclude>
  931. - <ClInclude Include="..\..\xbmc\filesystem\DAVFile.h">
  932. - <Filter>filesystem</Filter>
  933. - </ClInclude>
  934. - <ClInclude Include="..\..\xbmc\filesystem\DAVCommon.h">
  935. - <Filter>filesystem</Filter>
  936. - </ClInclude>
  937. - <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.h">
  938. - <Filter>peripherals\bus</Filter>
  939. - </ClInclude>
  940. - <ClInclude Include="..\..\xbmc\network\upnp\UPnPSettings.h">
  941. - <Filter>network\upnp</Filter>
  942. - </ClInclude>
  943. - <ClInclude Include="..\..\xbmc\AppParamParser.h" />
  944. - <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.h">
  945. - <Filter>settings\dialogs</Filter>
  946. - </ClInclude>
  947. - <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.h">
  948. - <Filter>settings\dialogs</Filter>
  949. - </ClInclude>
  950. - <ClInclude Include="..\..\xbmc\settings\windows\GUISettingControls.h">
  951. - <Filter>settings\windows</Filter>
  952. - </ClInclude>
  953. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettings.h">
  954. - <Filter>settings\windows</Filter>
  955. - </ClInclude>
  956. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.h">
  957. - <Filter>settings\windows</Filter>
  958. - </ClInclude>
  959. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.h">
  960. - <Filter>settings\windows</Filter>
  961. - </ClInclude>
  962. - <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.h">
  963. - <Filter>settings\windows</Filter>
  964. - </ClInclude>
  965. - <ClInclude Include="..\..\xbmc\utils\IRssObserver.h">
  966. - <Filter>utils</Filter>
  967. - </ClInclude>
  968. - <ClInclude Include="..\..\xbmc\utils\RssManager.h">
  969. - <Filter>utils</Filter>
  970. - </ClInclude> <ClInclude Include="..\..\xbmc\cores\DSPlayer\ChaptersManager.h">
  971. - <Filter>cores\DSPlayer</Filter>
  972. - </ClInclude>
  973. - <ClInclude Include="..\..\xbmc\settings\ISettingsHandler.h">
  974. - <Filter>settings</Filter>
  975. - </ClInclude>
  976. - <ClInclude Include="..\..\xbmc\settings\ISubSettings.h">
  977. - <Filter>settings</Filter>
  978. - </ClInclude>
  979. - <ClInclude Include="..\..\xbmc\settings\SkinSettings.h">
  980. - <Filter>settings</Filter>
  981. - </ClInclude>
  982. - <ClInclude Include="..\..\xbmc\settings\MediaSourceSettings.h">
  983. - <Filter>settings</Filter>
  984. - </ClInclude>
  985. - <ClInclude Include="..\..\xbmc\view\ViewStateSettings.h">
  986. - <Filter>view</Filter>
  987. - </ClInclude>
  988. - <ClInclude Include="..\..\xbmc\settings\MediaSettings.h">
  989. - <Filter>settings</Filter>
  990. - </ClInclude>
  991. - <ClInclude Include="..\..\xbmc\settings\DisplaySettings.h">
  992. - <Filter>settings</Filter>
  993. - </ClInclude>
  994. - <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.h">
  995. - <Filter>profiles\dialogs</Filter>
  996. - </ClInclude>
  997. - <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.h">
  998. - <Filter>profiles\dialogs</Filter>
  999. - </ClInclude>
  1000. - <ClInclude Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.h">
  1001. - <Filter>profiles\windows</Filter>
  1002. - </ClInclude>
  1003. - <ClInclude Include="..\..\xbmc\profiles\Profile.h">
  1004. - <Filter>profiles</Filter>
  1005. - </ClInclude>
  1006. - <ClInclude Include="..\..\xbmc\profiles\ProfilesManager.h">
  1007. - <Filter>profiles</Filter>
  1008. - </ClInclude>
  1009. - <ClInclude Include="..\..\xbmc\input\touch\ITouchActionHandler.h">
  1010. - <Filter>input\touch</Filter>
  1011. - </ClInclude>
  1012. - <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.h">
  1013. - <Filter>input\touch\generic</Filter>
  1014. - </ClInclude>
  1015. - <ClInclude Include="..\..\xbmc\input\touch\TouchTypes.h">
  1016. - <Filter>input\touch</Filter>
  1017. - </ClInclude>
  1018. - <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.h">
  1019. - <Filter>input\touch\generic</Filter>
  1020. - </ClInclude>
  1021. - <ClInclude Include="..\..\xbmc\input\touch\generic\IGenericTouchGestureDetector.h">
  1022. - <Filter>input\touch\generic</Filter>
  1023. - </ClInclude>
  1024. - <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandler.h">
  1025. - <Filter>input\touch</Filter>
  1026. - </ClInclude>
  1027. - <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandling.h">
  1028. - <Filter>input\touch</Filter>
  1029. - </ClInclude>
  1030. - <ClInclude Include="..\..\xbmc\utils\Vector.h">
  1031. - <Filter>utils</Filter>
  1032. - </ClInclude>
  1033. - <ClInclude Include="..\..\xbmc\video\PlayerController.h">
  1034. - <Filter>video</Filter>
  1035. - </ClInclude>
  1036. - <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h">
  1037. - <Filter>filesystem\VideoDatabaseDirectory</Filter>
  1038. - </ClInclude>
  1039. - <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h">
  1040. - <Filter>filesystem\MusicDatabaseDirectory</Filter>
  1041. - </ClInclude>
  1042. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSGraph.h">
  1043. - <Filter>cores\DSPlayer</Filter>
  1044. - </ClInclude>
  1045. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSMessage.h">
  1046. - <Filter>cores\DSPlayer</Filter>
  1047. - </ClInclude>
  1048. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSPlayer.h">
  1049. - <Filter>cores\DSPlayer</Filter>
  1050. - </ClInclude>
  1051. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSPropertyPage.h">
  1052. - <Filter>cores\DSPlayer</Filter>
  1053. - </ClInclude>
  1054. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGFilter.h">
  1055. - <Filter>cores\DSPlayer</Filter>
  1056. - </ClInclude>
  1057. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGLoader.h">
  1058. - <Filter>cores\DSPlayer</Filter>
  1059. - </ClInclude>
  1060. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGManager.h">
  1061. - <Filter>cores\DSPlayer</Filter>
  1062. - </ClInclude>
  1063. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGManager2.h">
  1064. - <Filter>cores\DSPlayer</Filter>
  1065. - </ClInclude>
  1066. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\GraphFilters.h">
  1067. - <Filter>cores\DSPlayer</Filter>
  1068. - </ClInclude>
  1069. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\moreuuids.h">
  1070. - <Filter>cores\DSPlayer</Filter>
  1071. - </ClInclude>
  1072. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\StreamsManager.h">
  1073. - <Filter>cores\DSPlayer</Filter>
  1074. - </ClInclude>
  1075. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\AudioEnumerator.h">
  1076. - <Filter>cores\DSPlayer\Utils</Filter>
  1077. - </ClInclude>
  1078. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\DSTemplate.h">
  1079. - <Filter>cores\DSPlayer\Utils</Filter>
  1080. - </ClInclude>
  1081. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\IPinHook.h">
  1082. - <Filter>cores\DSPlayer\Utils</Filter>
  1083. - </ClInclude>
  1084. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\MacrovisionKicker.h">
  1085. - <Filter>cores\DSPlayer\Utils</Filter>
  1086. - </ClInclude>
  1087. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\SmartList.h">
  1088. - <Filter>cores\DSPlayer\Utils</Filter>
  1089. - </ClInclude>
  1090. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\ExternalPixelShader.h">
  1091. - <Filter>cores\DSPlayer\Shaders</Filter>
  1092. - </ClInclude>
  1093. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\PixelShaderCompiler.h">
  1094. - <Filter>cores\DSPlayer\Shaders</Filter>
  1095. - </ClInclude>
  1096. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\PixelShaderList.h">
  1097. - <Filter>cores\DSPlayer\Shaders</Filter>
  1098. - </ClInclude>
  1099. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\ShadersSelectionRule.h">
  1100. - <Filter>cores\DSPlayer\Shaders</Filter>
  1101. - </ClInclude>
  1102. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\ffdshow_constants.h">
  1103. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1104. - </ClInclude>
  1105. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffDecoder.h">
  1106. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1107. - </ClInclude>
  1108. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowBase.h">
  1109. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1110. - </ClInclude>
  1111. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowDec.h">
  1112. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1113. - </ClInclude>
  1114. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowDecAudio.h">
  1115. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1116. - </ClInclude>
  1117. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowDecVideo.h">
  1118. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1119. - </ClInclude>
  1120. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowEnc.h">
  1121. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1122. - </ClInclude>
  1123. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowParamsEnum.h">
  1124. - <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1125. - </ClInclude>
  1126. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\DllLibSubs.h">
  1127. - <Filter>cores\DSPlayer\Interfaces</Filter>
  1128. - </ClInclude>
  1129. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\ILogImpl.h">
  1130. - <Filter>cores\DSPlayer\Interfaces</Filter>
  1131. - </ClInclude>
  1132. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\AllocatorCommon.h">
  1133. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1134. - </ClInclude>
  1135. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\DX9AllocatorPresenter.h">
  1136. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1137. - </ClInclude>
  1138. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\EVRAllocatorPresenter.h">
  1139. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1140. - </ClInclude>
  1141. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\RendererSettings.h">
  1142. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1143. - </ClInclude>
  1144. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\VMR9AllocatorPresenter.h">
  1145. - <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1146. - </ClInclude>
  1147. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileReader.h">
  1148. - <Filter>cores\DSPlayer\Filters\Source</Filter>
  1149. - </ClInclude>
  1150. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileSource.h">
  1151. - <Filter>cores\DSPlayer\Filters\Source</Filter>
  1152. - </ClInclude>
  1153. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSauth.h">
  1154. - <Filter>cores\DSPlayer\Filters\Include</Filter>
  1155. - </ClInclude>
  1156. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSscramble.h">
  1157. - <Filter>cores\DSPlayer\Filters\Include</Filter>
  1158. - </ClInclude>
  1159. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\DeCSSInputPin.h">
  1160. - <Filter>cores\DSPlayer\Filters\Include</Filter>
  1161. - </ClInclude>
  1162. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\asyncio.h">
  1163. - <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  1164. - </ClInclude>
  1165. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\asyncrdr.h">
  1166. - <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  1167. - </ClInclude>
  1168. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterCoreFactory.h">
  1169. - <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  1170. - </ClInclude>
  1171. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterSelectionRule.h">
  1172. - <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  1173. - </ClInclude>
  1174. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\GlobalFilterSelectionRule.h">
  1175. - <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  1176. - </ClInclude>
  1177. - <ClInclude Include="..\..\xbmc\cores\VideoRenderers\WinBaseRenderer.h">
  1178. - <Filter>cores\VideoRenderers</Filter>
  1179. - </ClInclude>
  1180. - <ClInclude Include="..\..\xbmc\cores\VideoRenderers\WinDsRenderer.h">
  1181. - <Filter>cores\VideoRenderers</Filter>
  1182. - </ClInclude>
  1183. - <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h" />
  1184. - <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h" />
  1185. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSInputStreamPVRManager.h">
  1186. - <Filter>cores\DSPlayer</Filter>
  1187. - </ClInclude>
  1188. - <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSPlayerDatabase.h">
  1189. - <Filter>cores\DSPlayer</Filter>
  1190. - </ClInclude>
  1191. + <ClInclude Include="..\..\xbmc\guilib\iimage.h">
  1192. + <Filter>guilib</Filter>
  1193. + </ClInclude>
  1194. + <ClInclude Include="..\..\xbmc\guilib\imagefactory.h">
  1195. + <Filter>guilib</Filter>
  1196. + </ClInclude>
  1197. + <ClInclude Include="..\..\xbmc\guilib\cximage.h">
  1198. + <Filter>guilib</Filter>
  1199. + </ClInclude>
  1200. + <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h">
  1201. + <Filter>music\karaoke</Filter>
  1202. + </ClInclude>
  1203. + <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h">
  1204. + <Filter>video</Filter>
  1205. + </ClInclude>
  1206. + <ClInclude Include="..\..\xbmc\view\GUIViewControl.h">
  1207. + <Filter>view</Filter>
  1208. + </ClInclude>
  1209. + <ClInclude Include="..\..\xbmc\view\GUIViewState.h">
  1210. + <Filter>view</Filter>
  1211. + </ClInclude>
  1212. + <ClInclude Include="..\..\xbmc\view\ViewDatabase.h">
  1213. + <Filter>view</Filter>
  1214. + </ClInclude>
  1215. + <ClInclude Include="..\..\xbmc\view\ViewState.h">
  1216. + <Filter>view</Filter>
  1217. + </ClInclude>
  1218. + <ClInclude Include="..\..\xbmc\filesystem\DAVFile.h">
  1219. + <Filter>filesystem</Filter>
  1220. + </ClInclude>
  1221. + <ClInclude Include="..\..\xbmc\filesystem\DAVCommon.h">
  1222. + <Filter>filesystem</Filter>
  1223. + </ClInclude>
  1224. + <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusCEC.h">
  1225. + <Filter>peripherals\bus</Filter>
  1226. + </ClInclude>
  1227. + <ClInclude Include="..\..\xbmc\network\upnp\UPnPSettings.h">
  1228. + <Filter>network\upnp</Filter>
  1229. + </ClInclude>
  1230. + <ClInclude Include="..\..\xbmc\AppParamParser.h" />
  1231. + <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogContentSettings.h">
  1232. + <Filter>settings\dialogs</Filter>
  1233. + </ClInclude>
  1234. + <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogSettings.h">
  1235. + <Filter>settings\dialogs</Filter>
  1236. + </ClInclude>
  1237. + <ClInclude Include="..\..\xbmc\settings\windows\GUISettingControls.h">
  1238. + <Filter>settings\windows</Filter>
  1239. + </ClInclude>
  1240. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettings.h">
  1241. + <Filter>settings\windows</Filter>
  1242. + </ClInclude>
  1243. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsCategory.h">
  1244. + <Filter>settings\windows</Filter>
  1245. + </ClInclude>
  1246. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowSettingsScreenCalibration.h">
  1247. + <Filter>settings\windows</Filter>
  1248. + </ClInclude>
  1249. + <ClInclude Include="..\..\xbmc\settings\windows\GUIWindowTestPattern.h">
  1250. + <Filter>settings\windows</Filter>
  1251. + </ClInclude>
  1252. + <ClInclude Include="..\..\xbmc\utils\IRssObserver.h">
  1253. + <Filter>utils</Filter>
  1254. + </ClInclude>
  1255. + <ClInclude Include="..\..\xbmc\utils\RssManager.h">
  1256. + <Filter>utils</Filter>
  1257. + </ClInclude>
  1258. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\ChaptersManager.h">
  1259. + <Filter>cores\DSPlayer</Filter>
  1260. + </ClInclude>
  1261. + <ClInclude Include="..\..\xbmc\settings\ISettingsHandler.h">
  1262. + <Filter>settings</Filter>
  1263. + </ClInclude>
  1264. + <ClInclude Include="..\..\xbmc\settings\ISubSettings.h">
  1265. + <Filter>settings</Filter>
  1266. + </ClInclude>
  1267. + <ClInclude Include="..\..\xbmc\settings\SkinSettings.h">
  1268. + <Filter>settings</Filter>
  1269. + </ClInclude>
  1270. + <ClInclude Include="..\..\xbmc\settings\MediaSourceSettings.h">
  1271. + <Filter>settings</Filter>
  1272. + </ClInclude>
  1273. + <ClInclude Include="..\..\xbmc\view\ViewStateSettings.h">
  1274. + <Filter>view</Filter>
  1275. + </ClInclude>
  1276. + <ClInclude Include="..\..\xbmc\settings\MediaSettings.h">
  1277. + <Filter>settings</Filter>
  1278. + </ClInclude>
  1279. + <ClInclude Include="..\..\xbmc\settings\DisplaySettings.h">
  1280. + <Filter>settings</Filter>
  1281. + </ClInclude>
  1282. + <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogLockSettings.h">
  1283. + <Filter>profiles\dialogs</Filter>
  1284. + </ClInclude>
  1285. + <ClInclude Include="..\..\xbmc\profiles\dialogs\GUIDialogProfileSettings.h">
  1286. + <Filter>profiles\dialogs</Filter>
  1287. + </ClInclude>
  1288. + <ClInclude Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.h">
  1289. + <Filter>profiles\windows</Filter>
  1290. + </ClInclude>
  1291. + <ClInclude Include="..\..\xbmc\profiles\Profile.h">
  1292. + <Filter>profiles</Filter>
  1293. + </ClInclude>
  1294. + <ClInclude Include="..\..\xbmc\profiles\ProfilesManager.h">
  1295. + <Filter>profiles</Filter>
  1296. + </ClInclude>
  1297. + <ClInclude Include="..\..\xbmc\input\touch\ITouchActionHandler.h">
  1298. + <Filter>input\touch</Filter>
  1299. + </ClInclude>
  1300. + <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchActionHandler.h">
  1301. + <Filter>input\touch\generic</Filter>
  1302. + </ClInclude>
  1303. + <ClInclude Include="..\..\xbmc\input\touch\TouchTypes.h">
  1304. + <Filter>input\touch</Filter>
  1305. + </ClInclude>
  1306. + <ClInclude Include="..\..\xbmc\input\touch\generic\GenericTouchSwipeDetector.h">
  1307. + <Filter>input\touch\generic</Filter>
  1308. + </ClInclude>
  1309. + <ClInclude Include="..\..\xbmc\input\touch\generic\IGenericTouchGestureDetector.h">
  1310. + <Filter>input\touch\generic</Filter>
  1311. + </ClInclude>
  1312. + <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandler.h">
  1313. + <Filter>input\touch</Filter>
  1314. + </ClInclude>
  1315. + <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandling.h">
  1316. + <Filter>input\touch</Filter>
  1317. + </ClInclude>
  1318. + <ClInclude Include="..\..\xbmc\utils\Vector.h">
  1319. + <Filter>utils</Filter>
  1320. + </ClInclude>
  1321. + <ClInclude Include="..\..\xbmc\video\PlayerController.h">
  1322. + <Filter>video</Filter>
  1323. + </ClInclude>
  1324. + <ClInclude Include="..\..\xbmc\filesystem\VideoDatabaseDirectory\DirectoryNodeGrouped.h">
  1325. + <Filter>filesystem\VideoDatabaseDirectory</Filter>
  1326. + </ClInclude>
  1327. + <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h">
  1328. + <Filter>filesystem\MusicDatabaseDirectory</Filter>
  1329. + </ClInclude>
  1330. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSGraph.h">
  1331. + <Filter>cores\DSPlayer</Filter>
  1332. + </ClInclude>
  1333. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSMessage.h">
  1334. + <Filter>cores\DSPlayer</Filter>
  1335. + </ClInclude>
  1336. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSPlayer.h">
  1337. + <Filter>cores\DSPlayer</Filter>
  1338. + </ClInclude>
  1339. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSPropertyPage.h">
  1340. + <Filter>cores\DSPlayer</Filter>
  1341. + </ClInclude>
  1342. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGFilter.h">
  1343. + <Filter>cores\DSPlayer</Filter>
  1344. + </ClInclude>
  1345. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGLoader.h">
  1346. + <Filter>cores\DSPlayer</Filter>
  1347. + </ClInclude>
  1348. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGManager.h">
  1349. + <Filter>cores\DSPlayer</Filter>
  1350. + </ClInclude>
  1351. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\FGManager2.h">
  1352. + <Filter>cores\DSPlayer</Filter>
  1353. + </ClInclude>
  1354. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\GraphFilters.h">
  1355. + <Filter>cores\DSPlayer</Filter>
  1356. + </ClInclude>
  1357. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\moreuuids.h">
  1358. + <Filter>cores\DSPlayer</Filter>
  1359. + </ClInclude>
  1360. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\StreamsManager.h">
  1361. + <Filter>cores\DSPlayer</Filter>
  1362. + </ClInclude>
  1363. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\AudioEnumerator.h">
  1364. + <Filter>cores\DSPlayer\Utils</Filter>
  1365. + </ClInclude>
  1366. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\DSTemplate.h">
  1367. + <Filter>cores\DSPlayer\Utils</Filter>
  1368. + </ClInclude>
  1369. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\IPinHook.h">
  1370. + <Filter>cores\DSPlayer\Utils</Filter>
  1371. + </ClInclude>
  1372. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\MacrovisionKicker.h">
  1373. + <Filter>cores\DSPlayer\Utils</Filter>
  1374. + </ClInclude>
  1375. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Utils\SmartList.h">
  1376. + <Filter>cores\DSPlayer\Utils</Filter>
  1377. + </ClInclude>
  1378. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\ExternalPixelShader.h">
  1379. + <Filter>cores\DSPlayer\Shaders</Filter>
  1380. + </ClInclude>
  1381. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\PixelShaderCompiler.h">
  1382. + <Filter>cores\DSPlayer\Shaders</Filter>
  1383. + </ClInclude>
  1384. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\PixelShaderList.h">
  1385. + <Filter>cores\DSPlayer\Shaders</Filter>
  1386. + </ClInclude>
  1387. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\ShadersSelectionRule.h">
  1388. + <Filter>cores\DSPlayer\Shaders</Filter>
  1389. + </ClInclude>
  1390. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\ffdshow_constants.h">
  1391. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1392. + </ClInclude>
  1393. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffDecoder.h">
  1394. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1395. + </ClInclude>
  1396. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowBase.h">
  1397. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1398. + </ClInclude>
  1399. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowDec.h">
  1400. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1401. + </ClInclude>
  1402. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowDecAudio.h">
  1403. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1404. + </ClInclude>
  1405. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowDecVideo.h">
  1406. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1407. + </ClInclude>
  1408. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowEnc.h">
  1409. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1410. + </ClInclude>
  1411. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\IffdshowParamsEnum.h">
  1412. + <Filter>cores\DSPlayer\Interfaces\ffdshow</Filter>
  1413. + </ClInclude>
  1414. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\DllLibSubs.h">
  1415. + <Filter>cores\DSPlayer\Interfaces</Filter>
  1416. + </ClInclude>
  1417. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\ILogImpl.h">
  1418. + <Filter>cores\DSPlayer\Interfaces</Filter>
  1419. + </ClInclude>
  1420. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\AllocatorCommon.h">
  1421. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1422. + </ClInclude>
  1423. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\DX9AllocatorPresenter.h">
  1424. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1425. + </ClInclude>
  1426. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\EVRAllocatorPresenter.h">
  1427. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1428. + </ClInclude>
  1429. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\RendererSettings.h">
  1430. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1431. + </ClInclude>
  1432. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\VMR9AllocatorPresenter.h">
  1433. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1434. + </ClInclude>
  1435. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileReader.h">
  1436. + <Filter>cores\DSPlayer\Filters\Source</Filter>
  1437. + </ClInclude>
  1438. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\XBMCFileSource.h">
  1439. + <Filter>cores\DSPlayer\Filters\Source</Filter>
  1440. + </ClInclude>
  1441. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSauth.h">
  1442. + <Filter>cores\DSPlayer\Filters\Include</Filter>
  1443. + </ClInclude>
  1444. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\CSSscramble.h">
  1445. + <Filter>cores\DSPlayer\Filters\Include</Filter>
  1446. + </ClInclude>
  1447. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Subtitles\decss\DeCSSInputPin.h">
  1448. + <Filter>cores\DSPlayer\Filters\Include</Filter>
  1449. + </ClInclude>
  1450. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\asyncio.h">
  1451. + <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  1452. + </ClInclude>
  1453. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\asyncrdr.h">
  1454. + <Filter>cores\DSPlayer\Filters\BaseClassFilters</Filter>
  1455. + </ClInclude>
  1456. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterCoreFactory.h">
  1457. + <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  1458. + </ClInclude>
  1459. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\FilterSelectionRule.h">
  1460. + <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  1461. + </ClInclude>
  1462. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\FilterCoreFactory\GlobalFilterSelectionRule.h">
  1463. + <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  1464. + </ClInclude>
  1465. + <ClInclude Include="..\..\xbmc\cores\VideoRenderers\WinBaseRenderer.h">
  1466. + <Filter>cores\VideoRenderers</Filter>
  1467. + </ClInclude>
  1468. + <ClInclude Include="..\..\xbmc\cores\VideoRenderers\WinDsRenderer.h">
  1469. + <Filter>cores\VideoRenderers</Filter>
  1470. + </ClInclude>
  1471. + <ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h" />
  1472. + <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h" />
  1473. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSInputStreamPVRManager.h">
  1474. + <Filter>cores\DSPlayer</Filter>
  1475. + </ClInclude>
  1476. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\DSPlayerDatabase.h">
  1477. + <Filter>cores\DSPlayer</Filter>
  1478. + </ClInclude>
  1479. + <ClInclude Include="..\..\xbmc\cores\DSPlayer\Filters\madVRAllocatorPresenter.h">
  1480. + <Filter>cores\DSPlayer\Filters\Video Renderers</Filter>
  1481. + </ClInclude>
  1482. </ItemGroup>
  1483. <ItemGroup>
  1484. <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
  1485. @@ -6152,4 +6167,4 @@
  1486. <Filter>cores\DSPlayer\FilterCoreFactory</Filter>
  1487. </None>
  1488. </ItemGroup>
  1489. -</Project>
  1490. +</Project>
  1491. \ No newline at end of file
  1492. diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
  1493. index 3da5771..9796876 100644
  1494. --- a/xbmc/Application.cpp
  1495. +++ b/xbmc/Application.cpp
  1496. @@ -258,6 +258,7 @@
  1497. #endif
  1498. #ifdef HAS_DS_PLAYER
  1499. #include "cores/DSPlayer/GUIDialogShaderList.h"
  1500. +#include "cores/DSPlayer/GraphFilters.h"
  1501. #endif
  1502. /* PVR related include Files */
  1503. #include "pvr/PVRManager.h"
  1504. @@ -2444,6 +2445,15 @@ void CApplication::Render()
  1505. else if (vsync_mode != VSYNC_DRIVER)
  1506. g_Windowing.SetVSync(false);
  1507.  
  1508. + /*MADVR*/
  1509. + if ( g_application.GetCurrentPlayer() == PCID_DSPLAYER )
  1510. + {
  1511. + if (CGraphFilters::Get()->GetCurrentRenderer() == DIRECTSHOW_RENDERER_MADVR)
  1512. + if (CGraphFilters::Get()->GetMadvrCallback() != NULL)
  1513. + CGraphFilters::Get()->GetMadvrCallback()->IsReady();
  1514. + }
  1515. + /*MADVR*/
  1516. +
  1517. if(!g_Windowing.BeginRender())
  1518. return;
  1519.  
  1520. @@ -2453,6 +2463,15 @@ void CApplication::Render()
  1521.  
  1522. g_Windowing.EndRender();
  1523.  
  1524. + /*MADVR*/
  1525. + if ( g_application.GetCurrentPlayer() == PCID_DSPLAYER )
  1526. + {
  1527. + if (CGraphFilters::Get()->GetCurrentRenderer() == DIRECTSHOW_RENDERER_MADVR)
  1528. + if (CGraphFilters::Get()->GetMadvrCallback() != NULL)
  1529. + CGraphFilters::Get()->GetMadvrCallback()->StartBack();
  1530. + }
  1531. + /*MADVR*/
  1532. +
  1533. // execute post rendering actions (finalize window closing)
  1534. g_windowManager.AfterRender();
  1535.  
  1536. @@ -2486,9 +2505,18 @@ void CApplication::Render()
  1537. }
  1538. m_lastFrameTime = XbmcThreads::SystemClockMillis();
  1539.  
  1540. - if (flip)
  1541. - g_graphicsContext.Flip(dirtyRegions);
  1542. - CTimeUtils::UpdateFrameTime(flip);
  1543. + /*MADVR*/
  1544. + if ((CGraphFilters::Get()->GetCurrentRenderer() == DIRECTSHOW_RENDERER_MADVR)&&(CGraphFilters::Get()->GetMadvrCallback() != NULL))
  1545. + {
  1546. + }
  1547. + else
  1548. + {
  1549. + if (flip)
  1550. + g_graphicsContext.Flip(dirtyRegions);
  1551. + }
  1552. +
  1553. +
  1554. + CTimeUtils::UpdateFrameTime(flip);
  1555.  
  1556. g_renderManager.UpdateResolution();
  1557. g_renderManager.ManageCaptures();
  1558. diff --git a/xbmc/cores/DSPlayer/FGFilter.cpp b/xbmc/cores/DSPlayer/FGFilter.cpp
  1559. index 5bb266a..e4248c0 100644
  1560. --- a/xbmc/cores/DSPlayer/FGFilter.cpp
  1561. +++ b/xbmc/cores/DSPlayer/FGFilter.cpp
  1562. @@ -33,6 +33,7 @@
  1563.  
  1564. #include "Filters/VMR9AllocatorPresenter.h"
  1565. #include "Filters/EVRAllocatorPresenter.h"
  1566. +#include "Filters/madVRAllocatorPresenter.h"
  1567. #include "windowing/WindowingFactory.h"
  1568. #include "utils/log.h"
  1569. #include "utils/charsetconverter.h"
  1570. @@ -362,8 +363,10 @@ CFGFilterFile::CFGFilterFile( TiXmlElement *pFilter )
  1571. }
  1572. }
  1573. }
  1574. -
  1575. - m_path = m_filterFound ? _P(m_path) : GetFilterPath(clsid);
  1576. + CStdString newpath;
  1577. + /*always convert to CStdStringA when needed*/
  1578. + g_charsetConverter.wToUTF8(GetFilterPath(clsid),newpath);
  1579. + m_path = m_filterFound ? _P(m_path) : newpath;
  1580.  
  1581. // Call super constructor
  1582. m_clsid = clsid;
  1583. @@ -454,7 +457,8 @@ HRESULT CFGFilterVideoRenderer::Create(IBaseFilter** ppBF)
  1584. CreateAP9(m_clsid, g_hWnd, &pCAP);
  1585. else if (m_clsid == CLSID_EVRAllocatorPresenter)
  1586. CreateEVR(m_clsid, g_hWnd, &pCAP);
  1587. -
  1588. + else if (m_clsid == CLSID_madVR)
  1589. + CreateMadVR(m_clsid, g_hWnd, &pCAP);
  1590. if(pCAP == NULL)
  1591. {
  1592. CLog::Log(LOGERROR, "%s Failed to create the allocater presenter (error: %s)", __FUNCTION__, __err.c_str());
  1593. diff --git a/xbmc/cores/DSPlayer/FGLoader.cpp b/xbmc/cores/DSPlayer/FGLoader.cpp
  1594. index 360f3bc..1f7e05d 100644
  1595. --- a/xbmc/cores/DSPlayer/FGLoader.cpp
  1596. +++ b/xbmc/cores/DSPlayer/FGLoader.cpp
  1597. @@ -44,6 +44,7 @@
  1598. #include "filters/XBMCFileSource.h"
  1599. #include "filters/VMR9AllocatorPresenter.h"
  1600. #include "filters/EVRAllocatorPresenter.h"
  1601. +#include "Filters/madVRAllocatorPresenter.h"
  1602.  
  1603. #include "Utils/AudioEnumerator.h"
  1604. #include "DVDFileInfo.h"
  1605. @@ -338,16 +339,21 @@ HRESULT CFGLoader::InsertVideoRenderer()
  1606. CGraphFilters::Get()->SetCurrentRenderer(DIRECTSHOW_RENDERER_VMR9);
  1607. }
  1608.  
  1609. +
  1610. + /*TEMP MADVR*/
  1611. + CGraphFilters::Get()->SetCurrentRenderer(DIRECTSHOW_RENDERER_MADVR);
  1612. +
  1613. // Renderers
  1614. if (CGraphFilters::Get()->GetCurrentRenderer() == DIRECTSHOW_RENDERER_EVR)
  1615. {
  1616. m_pFGF = new CFGFilterVideoRenderer(CLSID_EVRAllocatorPresenter, L"Xbmc EVR");
  1617. }
  1618. - else
  1619. + else if(CGraphFilters::Get()->GetCurrentRenderer() == DIRECTSHOW_RENDERER_VMR9)
  1620. {
  1621. m_pFGF = new CFGFilterVideoRenderer(CLSID_VMR9AllocatorPresenter, L"Xbmc VMR9");
  1622. }
  1623. -
  1624. + else if (CGraphFilters::Get()->GetCurrentRenderer() == DIRECTSHOW_RENDERER_MADVR)
  1625. + m_pFGF = new CFGFilterVideoRenderer(CLSID_madVR, L"MADVR");
  1626.  
  1627. hr = m_pFGF->Create( &CGraphFilters::Get()->VideoRenderer.pBF);
  1628. if (FAILED(hr))
  1629. diff --git a/xbmc/cores/DSPlayer/FGLoader.h b/xbmc/cores/DSPlayer/FGLoader.h
  1630. index 0fb1a0c..88ea43f 100644
  1631. --- a/xbmc/cores/DSPlayer/FGLoader.h
  1632. +++ b/xbmc/cores/DSPlayer/FGLoader.h
  1633. @@ -37,7 +37,7 @@ enum ESettingsType
  1634. MEDIAS,
  1635. FILTERS
  1636. };
  1637. -
  1638. +struct SFilterInfos;
  1639. class CFGLoader : public CCriticalSection
  1640. {
  1641. public:
  1642. diff --git a/xbmc/cores/DSPlayer/Filters/AllocatorCommon.cpp b/xbmc/cores/DSPlayer/Filters/AllocatorCommon.cpp
  1643. index 0f951a9..9b76776 100644
  1644. --- a/xbmc/cores/DSPlayer/Filters/AllocatorCommon.cpp
  1645. +++ b/xbmc/cores/DSPlayer/Filters/AllocatorCommon.cpp
  1646. @@ -31,7 +31,7 @@
  1647. #include "AllocatorCommon.h"
  1648. #include "VMR9AllocatorPresenter.h"
  1649. #include "EVRAllocatorPresenter.h"
  1650. -
  1651. +#include "madVRAllocatorPresenter.h"
  1652. bool IsVMR9InGraph(IFilterGraph* pFG)
  1653. {
  1654. BeginEnumFilters(pFG, pEF, pBF)
  1655. @@ -101,6 +101,32 @@ HRESULT CreateEVR(const CLSID& clsid, HWND hWnd, ISubPicAllocatorPresenter** ppA
  1656. return hr;
  1657. }
  1658.  
  1659. +HRESULT CreateMadVR(const CLSID& clsid, HWND hWnd, ISubPicAllocatorPresenter** ppAP)
  1660. +{
  1661. + HRESULT hr = E_FAIL;
  1662. + if (clsid == CLSID_madVR)
  1663. + {
  1664. + CStdString Error;
  1665. + *ppAP = DNew CmadVRAllocatorPresenter(hWnd, hr, Error);
  1666. + (*ppAP)->AddRef();
  1667. +
  1668. + if(FAILED(hr))
  1669. + {
  1670. + Error += "\n";
  1671. + Error += GetWindowsErrorMessage(hr, NULL);
  1672. + CLog::Log(LOGERROR, "%s %s", __FUNCTION__, Error.c_str());
  1673. + (*ppAP)->Release();
  1674. + *ppAP = NULL;
  1675. + }
  1676. + else if (!Error.IsEmpty())
  1677. + {
  1678. + CLog::Log(LOGWARNING, "%s %s", __FUNCTION__, Error.c_str());
  1679. + }
  1680. + }
  1681. +
  1682. + return hr;
  1683. +}
  1684. +
  1685. CStdString GetWindowsErrorMessage(HRESULT _Error, HMODULE _Module)
  1686. {
  1687.  
  1688. diff --git a/xbmc/cores/DSPlayer/Filters/AllocatorCommon.h b/xbmc/cores/DSPlayer/Filters/AllocatorCommon.h
  1689. index 70413b6..42fc93d 100644
  1690. --- a/xbmc/cores/DSPlayer/Filters/AllocatorCommon.h
  1691. +++ b/xbmc/cores/DSPlayer/Filters/AllocatorCommon.h
  1692. @@ -56,3 +56,4 @@ extern const char *GetD3DFormatStr(D3DFORMAT Format);
  1693.  
  1694. extern HRESULT CreateAP9(const CLSID& clsid, HWND hWnd, ISubPicAllocatorPresenter** ppAP);
  1695. extern HRESULT CreateEVR(const CLSID& clsid, HWND hWnd, ISubPicAllocatorPresenter** ppAP);
  1696. +extern HRESULT CreateMadVR(const CLSID& clsid, HWND hWnd, ISubPicAllocatorPresenter** ppAP);
  1697. \ No newline at end of file
  1698. diff --git a/xbmc/cores/DSPlayer/Filters/madVRAllocatorPresenter.cpp b/xbmc/cores/DSPlayer/Filters/madVRAllocatorPresenter.cpp
  1699. new file mode 100644
  1700. index 0000000..670149b
  1701. --- /dev/null
  1702. +++ b/xbmc/cores/DSPlayer/Filters/madVRAllocatorPresenter.cpp
  1703. @@ -0,0 +1,277 @@
  1704. +/*
  1705. + * Copyright (C) 2011 Team XBMC
  1706. + * http://www.xbmc.org
  1707. + *
  1708. + * This Program is free software; you can redistribute it and/or modify
  1709. + * it under the terms of the GNU General Public License as published by
  1710. + * the Free Software Foundation; either version 2, or (at your option)
  1711. + * any later version.
  1712. + *
  1713. + * This Program is distributed in the hope that it will be useful,
  1714. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  1715. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  1716. + * GNU General Public License for more details.
  1717. + *
  1718. + * You should have received a copy of the GNU General Public License
  1719. + * along with GNU Make; see the file COPYING. If not, write to
  1720. + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  1721. + * http://www.gnu.org/copyleft/gpl.html
  1722. + *
  1723. + */
  1724. +
  1725. +#ifdef HAS_DS_PLAYER
  1726. +#include "madVRAllocatorPresenter.h"
  1727. +#include "windowing/WindowingFactory.h"
  1728. +#include <moreuuids.h>
  1729. +#include "RendererSettings.h"
  1730. +#include "Application.h"
  1731. +#include "cores/VideoRenderers/RenderManager.h"
  1732. +#include "../DSPlayer.h"
  1733. +//
  1734. +// CmadVRAllocatorPresenter
  1735. +//
  1736. +
  1737. +CmadVRAllocatorPresenter::CmadVRAllocatorPresenter(HWND hWnd, HRESULT& hr, CStdString &_Error)
  1738. + : ISubPicAllocatorPresenterImpl(hWnd, hr)
  1739. + , m_ScreenSize(0, 0)
  1740. +{
  1741. + if(FAILED(hr)) {
  1742. + _Error += L"ISubPicAllocatorPresenterImpl failed\n";
  1743. + return;
  1744. + }
  1745. +
  1746. + hr = S_OK;
  1747. +}
  1748. +
  1749. +CmadVRAllocatorPresenter::~CmadVRAllocatorPresenter()
  1750. +{
  1751. + /*if(m_pSRCB) {
  1752. + ((CSubRenderCallback*)(ISubRenderCallback2*)m_pSRCB)->SetDXRAP(NULL);
  1753. + }*/
  1754. +
  1755. + m_pSubPicQueue = NULL;
  1756. + m_pAllocator = NULL;
  1757. + m_pDXR = NULL;
  1758. +}
  1759. +
  1760. +STDMETHODIMP CmadVRAllocatorPresenter::NonDelegatingQueryInterface(REFIID riid, void** ppv)
  1761. +{
  1762. + if(riid != IID_IUnknown && m_pDXR) {
  1763. + if(SUCCEEDED(m_pDXR->QueryInterface(riid, ppv))) {
  1764. + return S_OK;
  1765. + }
  1766. + }
  1767. +
  1768. + return __super::NonDelegatingQueryInterface(riid, ppv);
  1769. +}
  1770. +
  1771. +HRESULT CmadVRAllocatorPresenter::SetDevice(IDirect3DDevice9* pD3DDev)
  1772. +{
  1773. + if (!pD3DDev)
  1774. + {
  1775. + // release all resources
  1776. + m_pSubPicQueue = NULL;
  1777. + m_pAllocator = NULL;
  1778. + return S_OK;
  1779. + }
  1780. +
  1781. + Com::SmartSize size;
  1782. +
  1783. + //from mpc-hc
  1784. + switch(0)//GetRenderersSettings().nSPCMaxRes)
  1785. + {
  1786. + case 0:
  1787. + default:
  1788. + size = m_ScreenSize;
  1789. + break;
  1790. + case 1:
  1791. + size.SetSize(1024, 768);
  1792. + break;
  1793. + case 2:
  1794. + size.SetSize(800, 600);
  1795. + break;
  1796. + case 3:
  1797. + size.SetSize(640, 480);
  1798. + break;
  1799. + case 4:
  1800. + size.SetSize(512, 384);
  1801. + break;
  1802. + case 5:
  1803. + size.SetSize(384, 288);
  1804. + break;
  1805. + case 6:
  1806. + size.SetSize(2560, 1600);
  1807. + break;
  1808. + case 7:
  1809. + size.SetSize(1920, 1080);
  1810. + break;
  1811. + case 8:
  1812. + size.SetSize(1320, 900);
  1813. + break;
  1814. + case 9:
  1815. + size.SetSize(1280, 720);
  1816. + break;
  1817. + }
  1818. +
  1819. + if(m_pAllocator) {
  1820. + m_pAllocator->ChangeDevice(pD3DDev);
  1821. + } else {
  1822. + m_pAllocator = DNew CDX9SubPicAllocator(pD3DDev, size,true);
  1823. + if(!m_pAllocator) {
  1824. + return E_FAIL;
  1825. + }
  1826. + }
  1827. +
  1828. + HRESULT hr = S_OK;
  1829. +
  1830. + if (g_dsSettings.pRendererSettings->subtitlesSettings.bufferAhead > 0)
  1831. + m_pSubPicQueue = new CSubPicQueue(g_dsSettings.pRendererSettings->subtitlesSettings.bufferAhead, g_dsSettings.pRendererSettings->subtitlesSettings.disableAnimations, m_pAllocator, &hr);
  1832. + else
  1833. + m_pSubPicQueue = new CSubPicQueueNoThread(m_pAllocator, &hr);
  1834. + /*m_pSubPicQueue = GetRenderersSettings().nSPCSize > 0
  1835. + ? (ISubPicQueue*)DNew CSubPicQueue(GetRenderersSettings().nSPCSize, true,!GetRenderersSettings().fSPCAllowAnimationWhenBuffering, m_pAllocator, &hr)
  1836. + : (ISubPicQueue*)DNew CSubPicQueueNoThread(m_pAllocator, &hr);
  1837. + if(!m_pSubPicQueue || FAILED(hr)) {
  1838. + return E_FAIL;
  1839. + }
  1840. +
  1841. + if(m_SubPicProvider) {
  1842. + m_pSubPicQueue->SetSubPicProvider(m_SubPicProvider);
  1843. + }*/
  1844. +
  1845. + return S_OK;
  1846. +}
  1847. +
  1848. +HRESULT CmadVRAllocatorPresenter::Render(
  1849. + REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, REFERENCE_TIME atpf,
  1850. + int left, int top, int right, int bottom, int width, int height)
  1851. +{
  1852. + /*if (!g_renderManager.IsConfigured())
  1853. + {
  1854. + g_renderManager.Configure(m_NativeVideoSize.cx, m_NativeVideoSize.cy, m_AspectRatio.cx, m_AspectRatio.cy, m_fps,
  1855. + CONF_FLAGS_FULLSCREEN, 0);
  1856. + }*/
  1857. + //m_drawingIsDone.Reset();
  1858. + int64_t start = CurrentHostCounter();
  1859. +
  1860. +
  1861. + m_readyToDraw.Set();
  1862. + int64_t end1 = CurrentHostCounter();
  1863. + m_readyToStartBack.WaitMSec(200);
  1864. + int64_t end2 = CurrentHostCounter();
  1865. + //g_application.NewFrame();
  1866. + //m_drawingIsDone.Wait(); // Wait until the drawing is done
  1867. + __super::SetPosition(Com::SmartRect(0, 0, width, height), Com::SmartRect(left, top, right, bottom)); // needed? should be already set by the player
  1868. + SetTime(rtStart);
  1869. + if(atpf > 0 && m_pSubPicQueue) {
  1870. + m_pSubPicQueue->SetFPS(10000000.0 / atpf);
  1871. + }
  1872. + AlphaBltSubPic(Com::SmartSize(width, height));
  1873. + /*this to see the time it take to render*/
  1874. +#if 0
  1875. + CLog::Log(LOGINFO, "%s Rendering. Setting %.2fms Wait() took %.2fms", __FUNCTION__, 1000.f * (end1 - start) / CurrentHostFrequency(), 1000.f * (end2 - end1) / CurrentHostFrequency());
  1876. +#endif
  1877. + return S_OK;
  1878. +}
  1879. +
  1880. +// ISubPicAllocatorPresenter
  1881. +
  1882. +STDMETHODIMP CmadVRAllocatorPresenter::CreateRenderer(IUnknown** ppRenderer)
  1883. +{
  1884. + CheckPointer(ppRenderer, E_POINTER);
  1885. +
  1886. + if(m_pDXR) {
  1887. + return E_UNEXPECTED;
  1888. + }
  1889. + HRESULT hr = m_pDXR.CoCreateInstance(CLSID_madVR, GetOwner());
  1890. + if(!m_pDXR) {
  1891. + return E_FAIL;
  1892. + }
  1893. +
  1894. + Com::SmartQIPtr<ISubRender> pSR = m_pDXR;
  1895. + Com::SmartQIPtr<IMadVRDirect3D9Manager> pMadVrD3d = m_pDXR;
  1896. + m_pD3DDevice =g_Windowing.Get3DDevice();
  1897. + hr = pMadVrD3d->UseTheseDevices(m_pD3DDevice,m_pD3DDevice,m_pD3DDevice);
  1898. + hr = pMadVrD3d->ConfigureDisplayModeChanger(FALSE, FALSE);
  1899. + //Com::SmartQIPtr<IVideoWindow> pVW = m_pDXR;
  1900. + //hr = pVW->put_Owner((OAHWND)g_hWnd);
  1901. + //hr = pVW->put_Left(0);
  1902. + //hr = pVW->put_Top(0);
  1903. +
  1904. + if(!pSR) {
  1905. + m_pDXR = NULL;
  1906. + return E_FAIL;
  1907. + }
  1908. +
  1909. + m_pSRCB = DNew CSubRenderCallback(this);
  1910. + if(FAILED(pSR->SetCallback(m_pSRCB))) {
  1911. + m_pDXR = NULL;
  1912. + return E_FAIL;
  1913. + }
  1914. + Com::SmartQIPtr<IBaseFilter> pBF = this;
  1915. + if(FAILED(hr))
  1916. + *ppRenderer = NULL;
  1917. + else
  1918. + *ppRenderer = pBF.Detach();
  1919. + /*(*ppRenderer = this)->AddRef();*/
  1920. +
  1921. + MONITORINFO mi;
  1922. + mi.cbSize = sizeof(MONITORINFO);
  1923. + if (GetMonitorInfo(MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST), &mi)) {
  1924. + m_ScreenSize.SetSize(mi.rcMonitor.right-mi.rcMonitor.left, mi.rcMonitor.bottom-mi.rcMonitor.top);
  1925. + }
  1926. +
  1927. + CGraphFilters::Get()->SetMadVrCallback(this);
  1928. +
  1929. + return S_OK;
  1930. +}
  1931. +
  1932. +STDMETHODIMP_(void) CmadVRAllocatorPresenter::SetPosition(RECT w, RECT v)
  1933. +{
  1934. + if(Com::SmartQIPtr<IBasicVideo> pBV = m_pDXR) {
  1935. + pBV->SetDefaultSourcePosition();
  1936. + pBV->SetDestinationPosition(v.left, v.top, v.right - v.left, v.bottom - v.top);
  1937. + }
  1938. +
  1939. + if(Com::SmartQIPtr<IVideoWindow> pVW = m_pDXR) {
  1940. + pVW->SetWindowPosition(w.left, w.top, w.right - w.left, w.bottom - w.top);
  1941. + }
  1942. +}
  1943. +
  1944. +STDMETHODIMP_(SIZE) CmadVRAllocatorPresenter::GetVideoSize(bool fCorrectAR)
  1945. +{
  1946. + SIZE size = {0, 0};
  1947. +
  1948. + if(!fCorrectAR) {
  1949. + if(Com::SmartQIPtr<IBasicVideo> pBV = m_pDXR) {
  1950. + pBV->GetVideoSize(&size.cx, &size.cy);
  1951. + }
  1952. + } else {
  1953. + if(Com::SmartQIPtr<IBasicVideo2> pBV2 = m_pDXR) {
  1954. + pBV2->GetPreferredAspectRatio(&size.cx, &size.cy);
  1955. + }
  1956. + }
  1957. +
  1958. + return size;
  1959. +}
  1960. +
  1961. +STDMETHODIMP CmadVRAllocatorPresenter::GetDIB(BYTE* lpDib, DWORD* size)
  1962. +{
  1963. + HRESULT hr = E_NOTIMPL;
  1964. + if(Com::SmartQIPtr<IBasicVideo> pBV = m_pDXR) {
  1965. + hr = pBV->GetCurrentImage((long*)size, (long*)lpDib);
  1966. + }
  1967. + return hr;
  1968. +}
  1969. +
  1970. +STDMETHODIMP_(bool) CmadVRAllocatorPresenter::Paint(bool fAll)
  1971. +{
  1972. + return false;
  1973. +}
  1974. +
  1975. +STDMETHODIMP CmadVRAllocatorPresenter::SetPixelShader(LPCSTR pSrcData, LPCSTR pTarget)
  1976. +{
  1977. + return E_NOTIMPL;
  1978. +}
  1979. +
  1980. +#endif
  1981. \ No newline at end of file
  1982. diff --git a/xbmc/cores/DSPlayer/Filters/madVRAllocatorPresenter.h b/xbmc/cores/DSPlayer/Filters/madVRAllocatorPresenter.h
  1983. new file mode 100644
  1984. index 0000000..da71b8e
  1985. --- /dev/null
  1986. +++ b/xbmc/cores/DSPlayer/Filters/madVRAllocatorPresenter.h
  1987. @@ -0,0 +1,117 @@
  1988. +/*
  1989. + * $Id$
  1990. + *
  1991. + * (C) 2006-2011 see AUTHORS
  1992. + *
  1993. + * This file is part of mplayerc.
  1994. + *
  1995. + * Mplayerc is free software; you can redistribute it and/or modify
  1996. + * it under the terms of the GNU General Public License as published by
  1997. + * the Free Software Foundation; either version 3 of the License, or
  1998. + * (at your option) any later version.
  1999. + *
  2000. + * Mplayerc is distributed in the hope that it will be useful,
  2001. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  2002. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  2003. + * GNU General Public License for more details.
  2004. + *
  2005. + * You should have received a copy of the GNU General Public License
  2006. + * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2007. + *
  2008. + */
  2009. +
  2010. +#pragma once
  2011. +
  2012. +#include "AllocatorCommon.h"
  2013. +#include "mvrInterfaces.h"
  2014. +#include "IPaintCallback.h"
  2015. +#include "../../../threads/Event.h"
  2016. +//#include "..\ID3dHack.h"
  2017. + class CmadVRAllocatorPresenter
  2018. + : public ISubPicAllocatorPresenterImpl,
  2019. + public IPaintCallbackMadvr
  2020. + {
  2021. + class CSubRenderCallback : public CUnknown, public ISubRenderCallback2, public CCritSec
  2022. + {
  2023. + CmadVRAllocatorPresenter* m_pDXRAP;
  2024. +
  2025. + public:
  2026. + CSubRenderCallback(CmadVRAllocatorPresenter* pDXRAP)
  2027. + : CUnknown(_T("CSubRender"), NULL)
  2028. + , m_pDXRAP(pDXRAP) {
  2029. + }
  2030. +
  2031. + DECLARE_IUNKNOWN
  2032. + STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv) {
  2033. + return
  2034. + QI(ISubRenderCallback)
  2035. + QI(ISubRenderCallback2)
  2036. + __super::NonDelegatingQueryInterface(riid, ppv);
  2037. + }
  2038. +
  2039. + void SetDXRAP(CmadVRAllocatorPresenter* pDXRAP) {
  2040. + CAutoLock cAutoLock(this);
  2041. + m_pDXRAP = pDXRAP;
  2042. + }
  2043. +
  2044. + // ISubRenderCallback
  2045. +
  2046. + STDMETHODIMP SetDevice(IDirect3DDevice9* pD3DDev) {
  2047. + CAutoLock cAutoLock(this);
  2048. + return m_pDXRAP ? m_pDXRAP->SetDevice(pD3DDev) : E_UNEXPECTED;
  2049. + }
  2050. +
  2051. + STDMETHODIMP Render(REFERENCE_TIME rtStart, int left, int top, int right, int bottom, int width, int height) {
  2052. + CAutoLock cAutoLock(this);
  2053. + return m_pDXRAP ? m_pDXRAP->Render(rtStart, 0, 0, left, top, right, bottom, width, height) : E_UNEXPECTED;
  2054. + }
  2055. +
  2056. + // ISubRendererCallback2
  2057. +
  2058. + STDMETHODIMP RenderEx(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, REFERENCE_TIME AvgTimePerFrame, int left, int top, int right, int bottom, int width, int height) {
  2059. + CAutoLock cAutoLock(this);
  2060. + return m_pDXRAP ? m_pDXRAP->Render(rtStart, rtStop, AvgTimePerFrame, left, top, right, bottom, width, height) : E_UNEXPECTED;
  2061. + }
  2062. + };
  2063. + Com::SmartPtr<IUnknown> m_pDXR;
  2064. + IDirect3DDevice9* m_pD3DDevice;
  2065. + Com::SmartPtr<ISubRenderCallback2> m_pSRCB;
  2066. + Com::SmartSize m_ScreenSize;
  2067. + bool m_bIsFullscreen;
  2068. + CEvent m_readyToDraw;
  2069. + CEvent m_readyToStartBack;
  2070. + public:
  2071. + CmadVRAllocatorPresenter(HWND hWnd, HRESULT& hr, CStdString &_Error);
  2072. + virtual ~CmadVRAllocatorPresenter();
  2073. +
  2074. + DECLARE_IUNKNOWN
  2075. + STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);
  2076. +
  2077. + HRESULT SetDevice(IDirect3DDevice9* pD3DDev);
  2078. + HRESULT Render(
  2079. + REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, REFERENCE_TIME atpf,
  2080. + int left, int top, int bottom, int right, int width, int height);
  2081. +
  2082. + // ISubPicAllocatorPresenter
  2083. + STDMETHODIMP CreateRenderer(IUnknown** ppRenderer);
  2084. + STDMETHODIMP_(void) SetPosition(RECT w, RECT v);
  2085. + STDMETHODIMP_(SIZE) GetVideoSize(bool fCorrectAR);
  2086. + STDMETHODIMP_(bool) Paint(bool fAll);
  2087. + STDMETHODIMP GetDIB(BYTE* lpDib, DWORD* size);
  2088. + STDMETHODIMP SetPixelShader(LPCSTR pSrcData, LPCSTR pTarget);
  2089. +
  2090. + //IPaintCallbackMadvr
  2091. + bool IsReady()
  2092. + {
  2093. + /*testing wait*/
  2094. + bool ready = m_readyToDraw.WaitMSec(50);
  2095. +
  2096. + return ready;
  2097. +
  2098. + };
  2099. + bool StartBack()
  2100. + {
  2101. + m_readyToStartBack.Set();
  2102. + return true;
  2103. + }
  2104. + };
  2105. \ No newline at end of file
  2106. diff --git a/xbmc/cores/DSPlayer/Filters/madVRTestPattern.cpp b/xbmc/cores/DSPlayer/Filters/madVRTestPattern.cpp
  2107. new file mode 100644
  2108. index 0000000..3897948
  2109. --- /dev/null
  2110. +++ b/xbmc/cores/DSPlayer/Filters/madVRTestPattern.cpp
  2111. @@ -0,0 +1,214 @@
  2112. +// ***************************************************************
  2113. +// madVRTestPattern.cpp version: 1.1.0 · date: 2013-11-27
  2114. +// -------------------------------------------------------------
  2115. +// madVR test pattern / calibration remote controlling
  2116. +// -------------------------------------------------------------
  2117. +// Copyright (C) 2013 - 2013 www.madshi.net, BSD license
  2118. +// ***************************************************************
  2119. +
  2120. +// 2013-11-27 1.1.0 added madVR_GetBlackAndWhiteLevel
  2121. +// 2013-06-15 1.0.0 initial version
  2122. +
  2123. +// ----------------------------------------------------------------------------
  2124. +
  2125. +#include "madVRTestPattern.h"
  2126. +
  2127. +// ----------------------------------------------------------------------------
  2128. +
  2129. +static HMODULE HcNetDll = NULL;
  2130. +static BOOL InitDone = false;
  2131. +static BOOL InitSuccess = false;
  2132. +
  2133. +static BOOL (WINAPI *ConnectDialog)(BOOL searchLan, HWND parentWindow) = NULL;
  2134. +static BOOL (WINAPI *BlindConnect)(BOOL searchLan, DWORD timeOut) = NULL;
  2135. +static BOOL (WINAPI *ConnectToIp)(LPCSTR ipAddress, DWORD timeOut) = NULL;
  2136. +static BOOL (WINAPI *GetBlackAndWhiteLevel)(int *blackLevel, int *whiteLevel) = NULL;
  2137. +static BOOL (WINAPI *Disable3dlut)() = NULL;
  2138. +static BOOL (WINAPI *GetDeviceGammaRamp_)(LPVOID ramp) = NULL;
  2139. +static BOOL (WINAPI *SetDeviceGammaRamp_)(LPVOID ramp) = NULL;
  2140. +static BOOL (WINAPI *SetOsdText)(LPCWSTR text) = NULL;
  2141. +static BOOL (WINAPI *SetBackground)(int patternAreaInPercent, COLORREF backgroundColor) = NULL;
  2142. +static BOOL (WINAPI *ShowProgressBar)(int numberOfRgbMeasurements) = NULL;
  2143. +static BOOL (WINAPI *SetProgressBarPos)(int currentPos, int maxPos) = NULL;
  2144. +static BOOL (WINAPI *ShowRGB)(double r, double g, double b) = NULL;
  2145. +static BOOL (WINAPI *Disconnect)() = NULL;
  2146. +static BOOL (WINAPI *IsAvailable)() = NULL;
  2147. +static BOOL (WINAPI *Find_Async)(HWND window, DWORD msg) = NULL;
  2148. +static BOOL (WINAPI *Connect)(HANDLE handle, ULONGLONG instance) = NULL;
  2149. +static void (WINAPI *LocConnectDialog)(LPCWSTR title, LPCWSTR text, LPCWSTR columns, LPCWSTR notListed, LPCWSTR select, LPCWSTR cancel) = NULL;
  2150. +static void (WINAPI *LocIpAddressDialog)(LPCWSTR title, LPCWSTR text, LPCWSTR connect, LPCWSTR cancel, LPCWSTR warningTitle, LPCWSTR warningText1, LPCWSTR warningText2) = NULL;
  2151. +
  2152. +BOOL Init()
  2153. +{
  2154. + HKEY hk1;
  2155. + DWORD size;
  2156. + LPWSTR us1;
  2157. + int i1;
  2158. +
  2159. + if (!InitDone)
  2160. + {
  2161. + #ifdef _WIN64
  2162. + HcNetDll = LoadLibraryW(L"madHcNet64.dll");
  2163. + #else
  2164. + HcNetDll = LoadLibraryW(L"madHcNet32.dll");
  2165. + #endif
  2166. + if ((!HcNetDll) && (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"CLSID\\{E1A8B82A-32CE-4B0D-BE0D-AA68C772E423}\\InprocServer32", 0, KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hk1) == ERROR_SUCCESS))
  2167. + {
  2168. + size = MAX_PATH * 2 + 2;
  2169. + us1 = (LPWSTR) LocalAlloc(LPTR, size + 20);
  2170. + i1 = RegQueryValueExW(hk1, NULL, NULL, NULL, (LPBYTE) us1, &size);
  2171. + if (i1 == ERROR_MORE_DATA)
  2172. + {
  2173. + LocalFree(us1);
  2174. + us1 = (LPWSTR) LocalAlloc(LPTR, size + 20);
  2175. + i1 = RegQueryValueExW(hk1, NULL, NULL, NULL, (LPBYTE) us1, &size);
  2176. + }
  2177. + if (i1 == ERROR_SUCCESS)
  2178. + {
  2179. + for (i1 = lstrlenW(us1) - 2; i1 > 0; i1--)
  2180. + if (us1[i1] == L'\\')
  2181. + {
  2182. + us1[i1 + 1] = 0;
  2183. + break;
  2184. + }
  2185. + #ifdef _WIN64
  2186. + wcscat_s(us1, size + 10, L"madHcNet64.dll");
  2187. + #else
  2188. + wcscat_s(us1, size + 10, L"madHcNet32.dll");
  2189. + #endif
  2190. + HcNetDll = LoadLibraryW(us1);
  2191. + }
  2192. + LocalFree(us1);
  2193. + RegCloseKey(hk1);
  2194. + }
  2195. + *(FARPROC*)&ConnectDialog = GetProcAddress(HcNetDll, "madVR_ConnectDialog" );
  2196. + *(FARPROC*)&BlindConnect = GetProcAddress(HcNetDll, "madVR_BlindConnect" );
  2197. + *(FARPROC*)&ConnectToIp = GetProcAddress(HcNetDll, "madVR_ConnectToIp" );
  2198. + *(FARPROC*)&GetBlackAndWhiteLevel = GetProcAddress(HcNetDll, "madVR_GetBlackAndWhiteLevel");
  2199. + *(FARPROC*)&Disable3dlut = GetProcAddress(HcNetDll, "madVR_Disable3dlut" );
  2200. + *(FARPROC*)&GetDeviceGammaRamp_ = GetProcAddress(HcNetDll, "madVR_GetDeviceGammaRamp" );
  2201. + *(FARPROC*)&SetDeviceGammaRamp_ = GetProcAddress(HcNetDll, "madVR_SetDeviceGammaRamp" );
  2202. + *(FARPROC*)&SetOsdText = GetProcAddress(HcNetDll, "madVR_SetOsdText" );
  2203. + *(FARPROC*)&SetBackground = GetProcAddress(HcNetDll, "madVR_SetBackground" );
  2204. + *(FARPROC*)&ShowProgressBar = GetProcAddress(HcNetDll, "madVR_ShowProgressBar" );
  2205. + *(FARPROC*)&SetProgressBarPos = GetProcAddress(HcNetDll, "madVR_SetProgressBarPos" );
  2206. + *(FARPROC*)&ShowRGB = GetProcAddress(HcNetDll, "madVR_ShowRGB" );
  2207. + *(FARPROC*)&Disconnect = GetProcAddress(HcNetDll, "madVR_Disconnect" );
  2208. + *(FARPROC*)&Find_Async = GetProcAddress(HcNetDll, "madVR_Find_Async" );
  2209. + *(FARPROC*)&Connect = GetProcAddress(HcNetDll, "madVR_Connect" );
  2210. + *(FARPROC*)&LocConnectDialog = GetProcAddress(HcNetDll, "Localize_ConnectDialog" );
  2211. + *(FARPROC*)&LocIpAddressDialog = GetProcAddress(HcNetDll, "Localize_IpAddressDialog" );
  2212. + InitSuccess = (ConnectDialog ) &&
  2213. + (BlindConnect ) &&
  2214. + (ConnectToIp ) &&
  2215. + (Disable3dlut ) &&
  2216. + (SetDeviceGammaRamp_) &&
  2217. + (SetOsdText ) &&
  2218. + (SetBackground ) &&
  2219. + (ShowProgressBar ) &&
  2220. + (ShowRGB ) &&
  2221. + (Disconnect ) &&
  2222. + (Find_Async ) &&
  2223. + (Connect ) &&
  2224. + (LocConnectDialog ) &&
  2225. + (LocIpAddressDialog );
  2226. + InitDone = true;
  2227. + }
  2228. + return InitSuccess;
  2229. +}
  2230. +
  2231. +// ----------------------------------------------------------------------------
  2232. +
  2233. +BOOL madVR_ConnectDialog(BOOL searchLan, HWND parentWindow)
  2234. +{
  2235. + return Init() && ConnectDialog(searchLan, parentWindow);
  2236. +}
  2237. +
  2238. +BOOL madVR_BlindConnect(BOOL searchLan, DWORD timeOut)
  2239. +{
  2240. + return Init() && BlindConnect(searchLan, timeOut);
  2241. +}
  2242. +
  2243. +BOOL madVR_ConnectToIp(LPCSTR ipAddress, DWORD timeOut)
  2244. +{
  2245. + return Init() && ConnectToIp(ipAddress, timeOut);
  2246. +}
  2247. +
  2248. +BOOL madVR_GetBlackAndWhiteLevel(int* blackLevel, int* whiteLevel)
  2249. +{
  2250. + return Init() && (GetBlackAndWhiteLevel) && GetBlackAndWhiteLevel(blackLevel, whiteLevel);
  2251. +}
  2252. +
  2253. +BOOL madVR_Disable3dlut()
  2254. +{
  2255. + return Init() && Disable3dlut();
  2256. +}
  2257. +
  2258. +BOOL madVR_GetDeviceGammaRamp(LPVOID ramp)
  2259. +{
  2260. + return Init() && (GetDeviceGammaRamp_) && GetDeviceGammaRamp_(ramp);
  2261. +}
  2262. +
  2263. +BOOL madVR_SetDeviceGammaRamp(LPVOID ramp)
  2264. +{
  2265. + return Init() && SetDeviceGammaRamp_(ramp);
  2266. +}
  2267. +
  2268. +BOOL madVR_SetOsdText(LPCWSTR text)
  2269. +{
  2270. + return Init() && SetOsdText(text);
  2271. +}
  2272. +
  2273. +BOOL madVR_SetBackground(int patternAreaInPercent, COLORREF backgroundColor)
  2274. +{
  2275. + return Init() && SetBackground(patternAreaInPercent, backgroundColor);
  2276. +}
  2277. +
  2278. +BOOL madVR_ShowProgressBar(int numberOfRgbMeasurements)
  2279. +{
  2280. + return Init() && ShowProgressBar(numberOfRgbMeasurements);
  2281. +}
  2282. +
  2283. +BOOL madVR_SetProgressBarPos(int currentPos, int maxPos)
  2284. +{
  2285. + return Init() && (SetProgressBarPos) && SetProgressBarPos(currentPos, maxPos);
  2286. +}
  2287. +
  2288. +BOOL madVR_ShowRGB(double r, double g, double b)
  2289. +{
  2290. + return Init() && ShowRGB(r, g, b);
  2291. +}
  2292. +
  2293. +BOOL madVR_Disconnect()
  2294. +{
  2295. + return Init() && Disconnect();
  2296. +}
  2297. +
  2298. +BOOL madVR_Find_Async(HWND window, DWORD msg)
  2299. +{
  2300. + return Init() && Find_Async(window, msg);
  2301. +}
  2302. +
  2303. +BOOL madVR_Connect(HANDLE handle, ULONGLONG instance)
  2304. +{
  2305. + return Init() && Connect(handle, instance);
  2306. +}
  2307. +
  2308. +BOOL madVR_IsAvailable()
  2309. +{
  2310. + return Init();
  2311. +}
  2312. +
  2313. +void Localize_ConnectDialog(LPCWSTR title, LPCWSTR text, LPCWSTR columns, LPCWSTR notListed, LPCWSTR select, LPCWSTR cancel)
  2314. +{
  2315. + if (Init())
  2316. + LocConnectDialog(title, text, columns, notListed, select, cancel);
  2317. +}
  2318. +
  2319. +void Localize_IpAddressDialog(LPCWSTR title, LPCWSTR text, LPCWSTR connect, LPCWSTR cancel, LPCWSTR warningTitle, LPCWSTR warningText1, LPCWSTR warningText2)
  2320. +{
  2321. + if (Init())
  2322. + LocIpAddressDialog(title, text, connect, cancel, warningTitle, warningText1, warningText2);
  2323. +}
  2324. +
  2325. +// ----------------------------------------------------------------------------
  2326. diff --git a/xbmc/cores/DSPlayer/Filters/madVRTestPattern.h b/xbmc/cores/DSPlayer/Filters/madVRTestPattern.h
  2327. new file mode 100644
  2328. index 0000000..6a3f7ce
  2329. --- /dev/null
  2330. +++ b/xbmc/cores/DSPlayer/Filters/madVRTestPattern.h
  2331. @@ -0,0 +1,246 @@
  2332. +// ***************************************************************
  2333. +// madVRTestPattern.h version: 1.1.0 · date: 2013-11-27
  2334. +// -------------------------------------------------------------
  2335. +// madVR test pattern / calibration remote controlling
  2336. +// -------------------------------------------------------------
  2337. +// Copyright (C) 2013 - 2013 www.madshi.net, BSD license
  2338. +// ***************************************************************
  2339. +
  2340. +// 2013-11-27 1.1.0 added madVR_GetBlackAndWhiteLevel
  2341. +// 2013-06-15 1.0.0 initial version
  2342. +
  2343. +// ----------------------------------------------------------------------------
  2344. +
  2345. +#if !defined(MADVR_H)
  2346. +#define MADVR_H
  2347. +
  2348. +#ifdef __cplusplus
  2349. + extern "C" {
  2350. +#endif
  2351. +
  2352. +#include <windows.h>
  2353. +
  2354. +#pragma pack(1)
  2355. +
  2356. +// ============================================================================
  2357. +// I. THE EASY WAY
  2358. +// ============================================================================
  2359. +
  2360. +// ----------------------------------------------------------------------------
  2361. +// connecting to madVR - three options
  2362. +
  2363. +// (1) "madVR_ConnectDialog" searches for madVR instances on the local PC and
  2364. +// optionally also the LAN, then shows all found instances in a dialog and
  2365. +// lets the user choose which one to connect to.
  2366. +// Searching the LAN will only work if the user has enabled network access
  2367. +// in the madVR tray icon configuration. Also, searching the LAN might
  2368. +// popup a Firewall confirmation window.
  2369. +// "result=true" means: Connection to the selected madVR instance was opened.
  2370. +// "result=false" means: The user aborted the connection process.
  2371. +#ifdef __cplusplus
  2372. + BOOL madVR_ConnectDialog(BOOL searchLan = TRUE, HWND parentWindow = NULL);
  2373. +#else
  2374. + BOOL madVR_ConnectDialog(BOOL searchLan , HWND parentWindow );
  2375. +#endif
  2376. +
  2377. +// (2) "madVR_BlindConnect" searches for madVR instances on the local PC and
  2378. +// optionally also the LAN, then simply connects to the first found
  2379. +// instance. Local PC instances are preferred over LAN instances.
  2380. +// Searching the LAN will only work if the user has enabled network access
  2381. +// in the madVR tray icon configuration. Also, searching the LAN might
  2382. +// popup a Firewall confirmation window.
  2383. +// "result=true" means: A madVR instance was found and a connection opened.
  2384. +// "result=false" means: No madVR instance found, or connection failed.
  2385. +#ifdef __cplusplus
  2386. + BOOL madVR_BlindConnect(BOOL searchLan = TRUE, DWORD timeOut = 3000);
  2387. +#else
  2388. + BOOL madVR_BlindConnect(BOOL searchLan , DWORD timeOut );
  2389. +#endif
  2390. +
  2391. +// (3) If you want to connect to a madVR instance running on a LAN PC with a
  2392. +// known IP address, "madVR_ConnectToIp" lets you do just that.
  2393. +// Connecting to a madVR LAN instance will only work if the user has
  2394. +// enabled network access in the madVR tray icon configuration. Also,
  2395. +// using "madVR_ConnectToIp" might popup a Firewall confirmation window.
  2396. +// "result=true" means: A madVR instance was found and a connection opened.
  2397. +// "result=false" means: No madVR instance found, or connection failed.
  2398. +#ifdef __cplusplus
  2399. + BOOL madVR_ConnectToIp(LPCSTR ipAddress, DWORD timeOut = 1000);
  2400. +#else
  2401. + BOOL madVR_ConnectToIp(LPCSTR ipAddress, DWORD timeOut );
  2402. +#endif
  2403. +
  2404. +// ----------------------------------------------------------------------------
  2405. +// remote controlling the connected madVR instance
  2406. +
  2407. +// "madVR_GetBlackAndWhiteLevel" reports the madVR output level setup.
  2408. +// E.g. if madVR is setup to output TV levels, you'll get "blackLevel = 16" and
  2409. +// "whiteLevel = 235" reported.
  2410. +// The purpose of asking this information is that it allows you to avoid
  2411. +// dithering, if you so prefer. Dithering will be automatically disabled by
  2412. +// madVR if the final 8bit output value calculated by madVR ends up being a
  2413. +// simple cardinal without any fractional part.
  2414. +// E.g. if you use "madVR_ShowRGB(0.5, 0.5, 0.5)" with madVR configured to PC
  2415. +// levels, the final 8bit value will be 127.5, which means that madVR has to
  2416. +// use dithering to display the color correctly. If you want to avoid dithering,
  2417. +// use "x / (whiteLevel - blackLevel)" values.
  2418. +// Dithering in itself is not bad. It allows madVR to produce test pattern
  2419. +// colors which would otherwise not be possible to display in 8bit. However,
  2420. +// calibration quality might be ever so slightly improved if you choose
  2421. +// measurement colors which don't need dithering to display correctly. It's
  2422. +// your choice, though. Maybe some part of your calibration might even improve
  2423. +// if you have the chance to measure colors with a bitdepth higher than 8bit.
  2424. +BOOL madVR_GetBlackAndWhiteLevel(int *blackLevel, int *whiteLevel);
  2425. +
  2426. +// "madVR_Disable3dlut" disables 3dlut processing.
  2427. +// The 3dlut stays disabled until the connection is closed.
  2428. +// Disable the 3dlut if you want to calibrate/profile the display, or if you
  2429. +// want to measure the display behaviour prior to calibration.
  2430. +// Don't disable the 3dlut if you want to measure the final display after full
  2431. +// calibration.
  2432. +BOOL madVR_Disable3dlut();
  2433. +
  2434. +// "madVR_Get/SetDeviceGammaRamp" calls the win32 API "Get/SetDeviceGammaRamp"
  2435. +// on the target PC / display. A "NULL" ramp sets a linear ramp.
  2436. +// The original ramp is automatically restored when you close the connection.
  2437. +#ifdef __cplusplus
  2438. + BOOL madVR_GetDeviceGammaRamp(LPVOID ramp);
  2439. + BOOL madVR_SetDeviceGammaRamp(LPVOID ramp = NULL);
  2440. +#else
  2441. + BOOL madVR_GetDeviceGammaRamp(LPVOID ramp);
  2442. + BOOL madVR_SetDeviceGammaRamp(LPVOID ramp);
  2443. +#endif
  2444. +
  2445. +// "madVR_SetOsdText" shows a "text" on the top left of the video image.
  2446. +BOOL madVR_SetOsdText(LPCWSTR text);
  2447. +
  2448. +// "madVR_SetBackground" lets you define how much percect of the madVR
  2449. +// rendering window is painted in the test pattern color, and how much is
  2450. +// painted with a specific background color.
  2451. +// Using a background color can make sense for plasma measurements.
  2452. +BOOL madVR_SetBackground(int patternAreaInPercent, COLORREF backgroundColor);
  2453. +
  2454. +// "madVR_ShowProgressBar" initializes the madVR progress bar.
  2455. +// It will progress one step with every "madVR_ShowRGB" call (see below).
  2456. +BOOL madVR_ShowProgressBar(int numberOfRgbMeasurements);
  2457. +
  2458. +// "madVR_SetProgressBarPos" sets the madVR progress bar to a specific pos.
  2459. +// After calling this API, the progress bar will not automatically move
  2460. +// forward after calls to "madVR_ShowRGB", anymore. Calling this API means
  2461. +// you have to manually move the progress bar.
  2462. +BOOL madVR_SetProgressBarPos(int currentPos, int maxPos);
  2463. +
  2464. +// "madVR_ShowRGB" shows a specific RGB color test pattern.
  2465. +// Values are gamma corrected with "black = 0.0" and "white = 1.0".
  2466. +// You can go below 0.0 or above 1.0 for BTB/WTW, if you want. Of course a test
  2467. +// pattern with BTB/WTW will only work if the connected madVR instance is
  2468. +// configured to TV level output.
  2469. +// "madVR_ShowRGB" blocks until the GPU has actually output the test pattern to
  2470. +// the display. How fast the display will actually show the test pattern will
  2471. +// depend on the display's input latency, which is outside of madVR's control.
  2472. +BOOL madVR_ShowRGB(double r, double g, double b);
  2473. +
  2474. +// ----------------------------------------------------------------------------
  2475. +// disconnecting from madVR
  2476. +
  2477. +// "madVR_Disconnect" closes the current connection to madVR.
  2478. +BOOL madVR_Disconnect();
  2479. +
  2480. +// ----------------------------------------------------------------------------
  2481. +// checking madVR availability
  2482. +
  2483. +// "madVR_IsAvailable" checks whether the madHcNet32.dll can be found.
  2484. +// It must either be in the current directory, or in the search path.
  2485. +// Or alternatively it will also work if madVR is installed on the current PC.
  2486. +BOOL madVR_IsAvailable();
  2487. +
  2488. +// ----------------------------------------------------------------------------
  2489. +
  2490. +
  2491. +// ============================================================================
  2492. +// II. THE HARD WAY
  2493. +// ============================================================================
  2494. +
  2495. +// ----------------------------------------------------------------------------
  2496. +// finding / enumerating madVR instances on the LAN
  2497. +
  2498. +// The following API lets you automatically locate madVR instances running
  2499. +// anywhere on either the local PC or remote PCs connected via LAN.
  2500. +// For every found madVR instance this full information record is returned:
  2501. +
  2502. +typedef struct _TMadVRInstance
  2503. +{ // Example 1: // Example 2:
  2504. + HANDLE handle; // 1 // 2
  2505. + ULONGLONG instance; // 0x40001000 // 0x40001000
  2506. + LPSTR ipAddress; // "192.168.1.1" // "192.168.1.1"
  2507. + LPWSTR computerName; // "HTPC" // "HTPC"
  2508. + LPWSTR userName; // "Walter" // "Walter"
  2509. + LPWSTR os; // "Windows XP" // "Windows 8"
  2510. + ULONG_PTR processId; // 220 // 248
  2511. + LPWSTR processName; // "MPC-HC" // "madVR test pattern generator"
  2512. + LPWSTR exeFile; // "mplayerc.exe" // "madTPG.exe"
  2513. + LPWSTR exeVersion; // 1.3.2066.0 // 1.0.0.0
  2514. + LPWSTR madVRVersion; // 0.86.4.0 // 0.86.4.0
  2515. + LPWSTR gpuName; // "Radeon 3850" // "GeForce 650"
  2516. + LPWSTR monitorName; // "JVC HD-350" // "JVC HD-350"
  2517. +} TMadVRInstance, *PMadVRInstance;
  2518. +
  2519. +// "madVR_Find_Async" also starts a search for madVR instances, but instead of
  2520. +// returning information directly, it will send a message to the specified
  2521. +// "window" for every found madVR instance.
  2522. +// After the search is complete, "madVR_Find_Async" will keep an eye open for
  2523. +// newly started and closed down madVR instances and automatically report them
  2524. +// to your "window", as well.
  2525. +// In order to stop notification, call "madVR_Find_Async" with NULL parameters.
  2526. +// wParam: 0 = a new madVR instance was detected
  2527. +// 1 = a known madVR instance closed down
  2528. +// lParam: "PMadVRInstance" of the new/closed madVR instance
  2529. +// do not free the PMadVRInstance, the memory is managed by madVR
  2530. +BOOL madVR_Find_Async(HWND window, DWORD msg);
  2531. +
  2532. +// ----------------------------------------------------------------------------
  2533. +// connection to a specific madVR instance
  2534. +
  2535. +// "madVR_Connect" connects you to the specified madVR instance.
  2536. +// If a previous connection exists, it will be closed automatically.
  2537. +// The "handle" and "instance" originate from a "madVR_Find(_Async)" search.
  2538. +BOOL madVR_Connect(HANDLE handle, ULONGLONG instance);
  2539. +
  2540. +// ----------------------------------------------------------------------------
  2541. +
  2542. +
  2543. +// ============================================================================
  2544. +// III. GUI LOCALIZATION
  2545. +// ============================================================================
  2546. +
  2547. +// Localize/customize all texts used by madVR_ConnectDialog.
  2548. +void Localize_ConnectDialog (LPCWSTR title, // madVR selection...
  2549. + LPCWSTR text, // Please make sure that madVR is running on the target computer and then select it here:
  2550. + LPCWSTR columns, // ip address|computer|pid|process|gpu|monitor|os
  2551. + LPCWSTR notListed, // The madVR instance I'm looking for is not listed
  2552. + LPCWSTR select, // Select
  2553. + LPCWSTR cancel // Cancel
  2554. + );
  2555. +
  2556. +// Localize/customize all texts used by madVR_IpAddressDialog.
  2557. +// This is a dialog used internally by madVR_ConnectDialog.
  2558. +void Localize_IpAddressDialog (LPCWSTR title, // find mad* instance...
  2559. + LPCWSTR text, // Please enter the IP address of the computer on which mad* is running:
  2560. + LPCWSTR connect, // Connect
  2561. + LPCWSTR cancel, // Cancel
  2562. + LPCWSTR warningTitle, // Warning...
  2563. + LPCWSTR warningText1, // There doesn't seem to be any madVR instance running on that computer.
  2564. + LPCWSTR warningText2 // The target computer does not react.\n\n
  2565. + ); // Please check if it's turned on and connected to the LAN.\n
  2566. + // You may also want to double check your firewall settings.
  2567. +
  2568. +// ----------------------------------------------------------------------------
  2569. +
  2570. +
  2571. +// ----------------------------------------------------------------------------
  2572. +
  2573. +#ifdef __cplusplus
  2574. + }
  2575. +#endif
  2576. +
  2577. +#endif
  2578. diff --git a/xbmc/cores/DSPlayer/Filters/mvrInterfaces.h b/xbmc/cores/DSPlayer/Filters/mvrInterfaces.h
  2579. new file mode 100644
  2580. index 0000000..e5ea660
  2581. --- /dev/null
  2582. +++ b/xbmc/cores/DSPlayer/Filters/mvrInterfaces.h
  2583. @@ -0,0 +1,720 @@
  2584. +// ***************************************************************
  2585. +// mvrInterfaces.h version: 1.0.7 · date: 2014-01-18
  2586. +// -------------------------------------------------------------
  2587. +// various interfaces exported by madVR
  2588. +// -------------------------------------------------------------
  2589. +// Copyright (C) 2011 - 2014 www.madshi.net, BSD license
  2590. +// ***************************************************************
  2591. +
  2592. +// 2014-01-18 1.0.7 added IMadVRSettings2
  2593. +// 2013-06-04 1.0.6 added IMadVRInfo
  2594. +// 2013-01-23 1.0.5 added IMadVRSubclassReplacement
  2595. +// 2012-11-18 1.0.4 added IMadVRExternalPixelShaders
  2596. +// 2012-10-07 1.0.3 added IMadVRExclusiveModeCallback
  2597. +// 2011-08-03 1.0.2 added IMadVRExclusiveModeControl
  2598. +// 2011-07-17 1.0.1 added IMadVRRefreshRateInfo
  2599. +// 2011-06-25 1.0.0 initial release
  2600. +
  2601. +#ifndef __mvrInterfaces__
  2602. +#define __mvrInterfaces__
  2603. +
  2604. +// ---------------------------------------------------------------------------
  2605. +// IMadVR
  2606. +// ---------------------------------------------------------------------------
  2607. +
  2608. +// use this CLSID to create a madVR instance
  2609. +
  2610. +DEFINE_GUID(CLSID_madVR, 0xe1a8b82a, 0x32ce, 0x4b0d, 0xbe, 0x0d, 0xaa, 0x68, 0xc7, 0x72, 0xe4, 0x23);
  2611. +
  2612. +// ---------------------------------------------------------------------------
  2613. +// IMadVROsdServices
  2614. +// ---------------------------------------------------------------------------
  2615. +
  2616. +// this interface allows you to draw your own graphical OSD
  2617. +// your OSD will work in both windowed + exclusive mode
  2618. +// there are 2 different ways to draw your OSD:
  2619. +
  2620. +// (1) using bitmaps
  2621. +// you can create multiple OSD elements
  2622. +// each OSD element gets a name, a bitmap and a position
  2623. +// the bitmap must be 24bit or 32bit RGB(A)
  2624. +// for transparency you can use a color key or an 8bit alpha channel
  2625. +
  2626. +// (2) using render callbacks
  2627. +// you can provide madVR with callbacks
  2628. +// these callbacks are then called during rendering
  2629. +// one callback will be called the rendering target was cleared
  2630. +// another callback will be called after rendering was fully completed
  2631. +// in your callbacks you can modify the render target any way you like
  2632. +
  2633. +// ---------------------------------------------------------------------------
  2634. +
  2635. +// when using the (1) bitmaps method, you can register a mouse callback
  2636. +// this callback will be called whenever a mouse event occurs
  2637. +// mouse pos (0, 0) is the left top corner of the OSD bitmap element
  2638. +// return "true" if your callback has handled the mouse message and
  2639. +// if you want the mouse message to be "eaten" (instead of passed on)
  2640. +typedef void (__stdcall *OSDMOUSECALLBACK)(LPCSTR name, LPVOID context, UINT message, WPARAM wParam, int posX, int posY);
  2641. +
  2642. +// when using the (2) render callbacks method, you need to provide
  2643. +// madVR with an instance of the IOsdRenderCallback interface
  2644. +// it contains three callbacks you have to provide
  2645. +[uuid("57FBF6DC-3E5F-4641-935A-CB62F00C9958")]
  2646. +interface IOsdRenderCallback : public IUnknown
  2647. +{
  2648. + // "SetDevice" is called when you register the callbacks
  2649. + // it provides you with the D3D device object used by madVR
  2650. + // when SetDevice is called with a "NULL" D3D device, you
  2651. + // *must* release all D3D resources you eventually allocated
  2652. + STDMETHOD(SetDevice)(IDirect3DDevice9 *dev) = 0;
  2653. +
  2654. + // "ClearBackground" is called after madVR cleared the render target
  2655. + // "RenderOsd" is called after madVR is fully done with rendering
  2656. + // fullOutputRect = (0, 0, outputSurfaceWidth, outputSurfaceHeight)
  2657. + // activeVideoRect = active video rendering rect inside of fullOutputRect
  2658. + // background area = the part of fullOutputRect which isn't covered by activeVideoRect
  2659. + STDMETHOD(ClearBackground)(LPCSTR name, REFERENCE_TIME frameStart, RECT *fullOutputRect, RECT *activeVideoRect) = 0;
  2660. + STDMETHOD(RenderOsd )(LPCSTR name, REFERENCE_TIME frameStart, RECT *fullOutputRect, RECT *activeVideoRect) = 0;
  2661. +};
  2662. +
  2663. +// this is the main interface which madVR provides to you
  2664. +[uuid("3AE03A88-F613-4BBA-AD3E-EE236976BF9A")]
  2665. +interface IMadVROsdServices : public IUnknown
  2666. +{
  2667. + // this API provides the (1) bitmap based method
  2668. + STDMETHOD(OsdSetBitmap)(
  2669. + LPCSTR name, // name of the OSD element, e.g. "YourMediaPlayer.SeekBar"
  2670. + HBITMAP leftEye = NULL, // OSD bitmap, should be 24bit or 32bit, NULL deletes the OSD element
  2671. + HBITMAP rightEye = NULL, // specify when your OSD is 3D, otherwise set to NULL
  2672. + COLORREF colorKey = 0, // transparency color key, set to 0 if your bitmap has an 8bit alpha channel
  2673. + int posX = 0, // where to draw the OSD element?
  2674. + int posY = 0, //
  2675. + bool posRelativeToVideoRect = false, // draw relative to TRUE: the active video rect; FALSE: the full output rect
  2676. + int zOrder = 0, // high zOrder OSD elements are drawn on top of those with smaller zOrder values
  2677. + DWORD duration = 0, // how many milliseconds shall the OSD element be shown (0 = infinite)?
  2678. + DWORD flags = 0, // undefined - set to 0
  2679. + OSDMOUSECALLBACK callback = NULL, // optional callback for mouse events
  2680. + LPVOID callbackContext = NULL, // this context is passed to the callback
  2681. + LPVOID reserved = NULL // undefined - set to NULL
  2682. + ) = 0;
  2683. +
  2684. + // this API allows you to ask the current video rectangles
  2685. + STDMETHOD(OsdGetVideoRects)(
  2686. + RECT *fullOutputRect, // (0, 0, outputSurfaceWidth, outputSurfaceHeight)
  2687. + RECT *activeVideoRect // active video rendering rect inside of fullOutputRect
  2688. + ) = 0;
  2689. +
  2690. + // this API provides the (2) render callback based method
  2691. + STDMETHOD(OsdSetRenderCallback)(
  2692. + LPCSTR name, // name of the OSD callback, e.g. "YourMediaPlayer.OsdCallbacks"
  2693. + IOsdRenderCallback *callback = NULL, // OSD callback interface, set to NULL to unregister the callback
  2694. + LPVOID reserved = NULL // undefined - set to NULL
  2695. + ) = 0;
  2696. +
  2697. + // this API allows you to force madVR to redraw the current video frame
  2698. + // useful when using the (2) render callback method, when the graph is paused
  2699. + STDMETHOD(OsdRedrawFrame)(void) = 0;
  2700. +};
  2701. +
  2702. +// ---------------------------------------------------------------------------
  2703. +// IMadVRTextOsd
  2704. +// ---------------------------------------------------------------------------
  2705. +
  2706. +// This interface allows you to draw simple text messages.
  2707. +// madVR uses it internally, too, for showing various messages to the user.
  2708. +// The messages are shown in the top left corner of the video rendering window.
  2709. +// The messages work in both windowed and fullscreen exclusive mode.
  2710. +// There can always be only one message active at the same time, so basically
  2711. +// the messages are overwriting each other.
  2712. +
  2713. +[uuid("ABA34FDA-DD22-4E00-9AB4-4ABF927D0B0C")]
  2714. +interface IMadVRTextOsd : public IUnknown
  2715. +{
  2716. + STDMETHOD(OsdDisplayMessage)(LPCWSTR text, DWORD milliseconds) = 0;
  2717. + STDMETHOD(OsdClearMessage)(void) = 0;
  2718. +};
  2719. +
  2720. +// ---------------------------------------------------------------------------
  2721. +// IMadVRSubclassReplacement
  2722. +// ---------------------------------------------------------------------------
  2723. +
  2724. +// Normally madVR subclasses some parent of the madVR rendering window.
  2725. +// If your media player gets into stability issues because of that, you can
  2726. +// disable madVR's subclassing by using this interface. You should then
  2727. +// manually forward the messages from your own WindowProc to madVR by calling
  2728. +// this interface's "ParentWindowProc" method.
  2729. +// If "ParentWindowProc" returns "TRUE", you should consider the message
  2730. +// handled by madVR and *not* pass it on to the original WindowProc. Instead
  2731. +// just return the value madVR wrote to "result". If "ParentWindowProc"
  2732. +// returns "FALSE", process the message as usual.
  2733. +// When using the normal subclassing solution, madVR selects the parent window
  2734. +// to subclass by using the following code:
  2735. +// {
  2736. +// HWND parentWindow = madVRWindow;
  2737. +// while ((GetParent(parentWindow)) && (GetParent(parentWindow) == GetAncestor(parentWindow, GA_PARENT)))
  2738. +// parentWindow = GetParent(parentWindow);
  2739. +// }
  2740. +// If you use this interface, send the messages to madVR from the same window
  2741. +// that madVR would otherwise have subclassed.
  2742. +
  2743. +[uuid("9B517604-2D86-4FA2-A20C-ECF88301B010")]
  2744. +interface IMadVRSubclassReplacement : public IUnknown
  2745. +{
  2746. + STDMETHOD(DisableSubclassing)(void) = 0;
  2747. + STDMETHOD_(BOOL, ParentWindowProc)(HWND hwnd, UINT uMsg, WPARAM *wParam, LPARAM *lParam, LRESULT *result) = 0;
  2748. +};
  2749. +
  2750. +// ---------------------------------------------------------------------------
  2751. +// IMadVRSeekbarControl
  2752. +// ---------------------------------------------------------------------------
  2753. +
  2754. +// if you draw your own seekbar and absolutely insist on disliking madVR's
  2755. +// own seekbar, you can forcefully hide it by using this interface
  2756. +// using this interface only affects the current madVR instance
  2757. +
  2758. +[uuid("D2D3A520-7CFA-46EB-BA3B-6194A028781C")]
  2759. +interface IMadVRSeekbarControl : public IUnknown
  2760. +{
  2761. + STDMETHOD(DisableSeekbar)(BOOL disable) = 0;
  2762. +};
  2763. +
  2764. +// ---------------------------------------------------------------------------
  2765. +// IMadVRExclusiveModeControl
  2766. +// ---------------------------------------------------------------------------
  2767. +
  2768. +// you can use this interface to turn madVR's automatic exclusive mode on/off
  2769. +// using this interface only affects the current madVR instance
  2770. +
  2771. +[uuid("88A69329-3CD3-47D6-ADEF-89FA23AFC7F3")]
  2772. +interface IMadVRExclusiveModeControl : public IUnknown
  2773. +{
  2774. + STDMETHOD(DisableExclusiveMode)(BOOL disable) = 0;
  2775. +};
  2776. +
  2777. +// ---------------------------------------------------------------------------
  2778. +// IMadVRExclusiveModeCallback
  2779. +// ---------------------------------------------------------------------------
  2780. +
  2781. +// allows you to be notified when exclusive mode is entered/left
  2782. +
  2783. +#define ExclusiveModeIsAboutToBeEntered 1
  2784. +#define ExclusiveModeWasJustEntered 2
  2785. +#define ExclusiveModeIsAboutToBeLeft 3
  2786. +#define ExclusiveModeWasJustLeft 4
  2787. +typedef void (__stdcall *EXCLUSIVEMODECALLBACK)(LPVOID context, int event);
  2788. +
  2789. +[uuid("51CA9252-ACC5-4EC5-A02E-0F9F8C42B536")]
  2790. +interface IMadVRExclusiveModeCallback : public IUnknown
  2791. +{
  2792. + STDMETHOD( Register)(EXCLUSIVEMODECALLBACK exclusiveModeCallback, LPVOID context) = 0;
  2793. + STDMETHOD(Unregister)(EXCLUSIVEMODECALLBACK exclusiveModeCallback, LPVOID context) = 0;
  2794. +};
  2795. +
  2796. +// ---------------------------------------------------------------------------
  2797. +// IMadVRDirect3D9Manager
  2798. +// ---------------------------------------------------------------------------
  2799. +
  2800. +// You can make madVR use your Direct3D9 device(s) instead of creating its
  2801. +// own. If you do that, madVR will not automatically switch between
  2802. +// fullscreen and windowed mode, anymore. It's your duty then to enter
  2803. +// fullscreen exclusive mode, if you want madVR to use it. madVR will still
  2804. +// reset the devices, though, if necessary (lost device etc).
  2805. +
  2806. +[uuid("1CAEE23B-D14B-4DB4-8AEA-F3528CB78922")]
  2807. +interface IMadVRDirect3D9Manager : public IUnknown
  2808. +{
  2809. + // Creating 3 different devices for scanline reading, rendering and
  2810. + // presentation can improve overall performance. If you don't like that
  2811. + // idea, just feed madVR with the same device for all tasks.
  2812. + // You can't create new devices if one device is already in fullscreen
  2813. + // exclusive mode. So if you want to provide madVR with 3 different
  2814. + // devices, while still using exclusive mode, make sure you create the
  2815. + // scanline reading and rendering devices before setting the presentation
  2816. + // device to fullscreen exclusive mode.
  2817. + STDMETHOD(UseTheseDevices)(LPDIRECT3DDEVICE9 scanlineReading, LPDIRECT3DDEVICE9 rendering, LPDIRECT3DDEVICE9 presentation) = 0;
  2818. +
  2819. + // madVR contains a display mode changer which, depending on the video
  2820. + // size and frame rate, may decide to switch display modes. If you don't
  2821. + // want madVR to change either resolution or refresh rates, you can
  2822. + // disable this functionality partially or completely.
  2823. + STDMETHOD(ConfigureDisplayModeChanger)(BOOL allowResolutionChanges, BOOL allowRefreshRateChanges) = 0;
  2824. +};
  2825. +
  2826. +// ---------------------------------------------------------------------------
  2827. +// IMadVRExternalPixelShaders
  2828. +// ---------------------------------------------------------------------------
  2829. +
  2830. +// this interface allows you to activate external HLSL D3D9 pixel shaders
  2831. +
  2832. +#define ShaderStage_PreScale 0
  2833. +#define ShaderStage_PostScale 1
  2834. +
  2835. +[uuid("B6A6D5D4-9637-4C7D-AAAE-BC0B36F5E433")]
  2836. +interface IMadVRExternalPixelShaders : public IUnknown
  2837. +{
  2838. + STDMETHOD(ClearPixelShaders)(int stage) = 0;
  2839. + STDMETHOD(AddPixelShader)(LPCSTR sourceCode, LPCSTR compileProfile, int stage, LPVOID reserved) = 0;
  2840. +};
  2841. +
  2842. +// ---------------------------------------------------------------------------
  2843. +// IMadVRInfo
  2844. +// ---------------------------------------------------------------------------
  2845. +
  2846. +// this interface allows you to get all kinds of information from madVR
  2847. +
  2848. +[uuid("8FAB7F31-06EF-444C-A798-10314E185532")]
  2849. +interface IMadVRInfo : public IUnknown
  2850. +{
  2851. + // The memory for strings and binary data is allocated by the callee
  2852. + // by using LocalAlloc. It is the caller's responsibility to release the
  2853. + // memory by calling LocalFree.
  2854. + // Field names and LPWSTR values should be read case insensitive.
  2855. + STDMETHOD(GetBool )(LPCSTR field, bool *value) = 0;
  2856. + STDMETHOD(GetInt )(LPCSTR field, int *value) = 0;
  2857. + STDMETHOD(GetSize )(LPCSTR field, SIZE *value) = 0;
  2858. + STDMETHOD(GetRect )(LPCSTR field, RECT *value) = 0;
  2859. + STDMETHOD(GetUlonglong)(LPCSTR field, ULONGLONG *value) = 0;
  2860. + STDMETHOD(GetDouble )(LPCSTR field, double *value) = 0;
  2861. + STDMETHOD(GetString )(LPCSTR field, LPWSTR *value, int *chars) = 0;
  2862. + STDMETHOD(GetBin )(LPCSTR field, LPVOID *value, int *size ) = 0;
  2863. +};
  2864. +
  2865. +// available info fields:
  2866. +// ----------------------
  2867. +// version, string, madVR version number
  2868. +// originalVideoSize, size, size of the video before scaling and AR adjustments
  2869. +// arAdjustedVideoSize, size, size of the video after AR adjustments
  2870. +// videoOutputRect, rect, final pos/size of the video after all scaling operations
  2871. +// subtitleTargetRect, rect, consumer wish for where to place the subtitles
  2872. +// frameRate, ulonglong, frame rate of the video after deinterlacing (REFERENCE_TIME)
  2873. +// refreshRate, double, display refresh rate (0, if unknown)
  2874. +// displayModeSize, size, display mode width/height
  2875. +// yuvMatrix, string, RGB Video: "None" (fullrange); YCbCr Video: "Levels.Matrix", Levels: TV|PC, Matrix: 601|709|240M|FCC|2020
  2876. +// exclusiveModeActive, bool, is madVR currently in exclusive mode?
  2877. +// madVRSeekbarEnabled, bool, is the madVR exclusive mode seek bar currently enabled?
  2878. +// dxvaDecodingActive, bool, is DXVA2 decoding being used at the moment?
  2879. +// dxvaDeinterlacingActive, bool, is DXVA2 deinterlacing being used at the moment?
  2880. +// dxvaScalingActive, bool, is DXVA2 scaling being used at the moment?
  2881. +// ivtcActive, bool, is madVR's IVTC algorithm active at the moment?
  2882. +// osdLatency, int, how much milliseconds will pass for an OSD change to become visible?
  2883. +
  2884. +// ---------------------------------------------------------------------------
  2885. +// IMadVRSettings
  2886. +// ---------------------------------------------------------------------------
  2887. +
  2888. +// this interface allows you to read and write madVR settings
  2889. +
  2890. +// For each folder and value there exists both a short ID and a long
  2891. +// description. The short ID will never change. The long description may be
  2892. +// modified in a future version. So it's preferable to use the ID, but you can
  2893. +// also address settings by using the clear text description.
  2894. +
  2895. +// The "path" parameter can simply be set to the ID or to the description of
  2896. +// the setting value. Alternatively you can use a partial or full path to the
  2897. +// setting value. E.g. the following calls will all return the same value:
  2898. +// (1) GetBoolean(L"dontDither", &boolVal);
  2899. +// (2) GetBoolean(L"don't use dithering", &boolVal);
  2900. +// (3) GetBoolean(L"tradeQuality\dontDither", &boolVal);
  2901. +// (4) GetBoolean(L"rendering\trade quality for performance\dontDither", &boolVal);
  2902. +
  2903. +// Using the full path can make sense if you want to access a specific profile.
  2904. +// If you don't specify a path, you automatically access the currently active
  2905. +// profile.
  2906. +
  2907. +[uuid("6F8A566C-4E19-439E-8F07-20E46ED06DEE")]
  2908. +interface IMadVRSettings : public IUnknown
  2909. +{
  2910. + // returns the revision number of the settings record
  2911. + // the revision number is increased by 1 every time a setting changes
  2912. + STDMETHOD_(BOOL, SettingsGetRevision)(LONGLONG* revision) = 0;
  2913. +
  2914. + // export the whole settings record to a binary data buffer
  2915. + // the buffer is allocated by SettingsExport by using LocalAlloc
  2916. + // it's the caller's responsibility to free the buffer again by using LocalFree
  2917. + STDMETHOD_(BOOL, SettingsExport)(LPVOID* buf, int* size) = 0;
  2918. + // import the settings from a binary data buffer
  2919. + STDMETHOD_(BOOL, SettingsImport)(LPVOID buf, int size) = 0;
  2920. +
  2921. + // modify a specific value
  2922. + STDMETHOD_(BOOL, SettingsSetString )(LPCWSTR path, LPCWSTR value) = 0;
  2923. + STDMETHOD_(BOOL, SettingsSetInteger)(LPCWSTR path, int value) = 0;
  2924. + STDMETHOD_(BOOL, SettingsSetBoolean)(LPCWSTR path, BOOL value) = 0;
  2925. +
  2926. + // The buffer for SettingsGetString must be provided by the caller and
  2927. + // bufLenInChars set to the buffer's length (please note: 1 char -> 2 bytes).
  2928. + // If the buffer is too small, the API fails and GetLastError returns
  2929. + // ERROR_MORE_DATA. On return, bufLenInChars is set to the required buffer size.
  2930. + // The buffer for SettingsGetBinary is allocated by SettingsGetBinary.
  2931. + // The caller is responsible for freeing it by using LocalAlloc().
  2932. + STDMETHOD_(BOOL, SettingsGetString )(LPCWSTR path, LPCWSTR value, int* bufLenInChars) = 0;
  2933. + STDMETHOD_(BOOL, SettingsGetInteger)(LPCWSTR path, int* value) = 0;
  2934. + STDMETHOD_(BOOL, SettingsGetBoolean)(LPCWSTR path, BOOL* value) = 0;
  2935. + STDMETHOD_(BOOL, SettingsGetBinary )(LPCWSTR path, LPVOID* value, int* bufLenInBytes) = 0;
  2936. +};
  2937. +
  2938. +[uuid("1C3E03D6-F422-4D31-9424-75936F663BF7")]
  2939. +interface IMadVRSettings2 : public IMadVRSettings
  2940. +{
  2941. + // Enumerate the available settings stuff in the specified path.
  2942. + // Simply loop from enumIndex 0 to infinite, until the enumeration returns FALSE.
  2943. + // When enumeration is completed GetLastError returns ERROR_NO_MORE_ITEMS.
  2944. + // The buffers must be provided by the caller and ...LenInChars set to the
  2945. + // buffer's length (please note: 1 char -> 2 bytes). If the buffer is too small,
  2946. + // the API fails and GetLastError returns ERROR_MORE_DATA. On return,
  2947. + // ...LenInChars is set to the required buffer size.
  2948. + STDMETHOD_(BOOL, SettingsEnumFolders )(LPCWSTR path, int enumIndex, LPCWSTR id, LPCWSTR name, LPCWSTR type, int* idLenInChars, int* nameLenInChars, int* typeLenInChars) = 0;
  2949. + STDMETHOD_(BOOL, SettingsEnumValues )(LPCWSTR path, int enumIndex, LPCWSTR id, LPCWSTR name, LPCWSTR type, int* idLenInChars, int* nameLenInChars, int* typeLenInChars) = 0;
  2950. + STDMETHOD_(BOOL, SettingsEnumProfileGroups)(LPCWSTR path, int enumIndex, LPCWSTR name, int* nameLenInChars ) = 0;
  2951. + STDMETHOD_(BOOL, SettingsEnumProfiles )(LPCWSTR path, int enumIndex, LPCWSTR name, int* nameLenInChars ) = 0;
  2952. +
  2953. + // Creates/deletes a profile group in the specified path.
  2954. + // Deleting a profile group works only if there's only one profile left in the group.
  2955. + // Example:
  2956. + // SettingsCreateProfileGroup('scalingParent', 'imageDoubling|lumaUp', 'upscaling profiles', 'SD 24fps');
  2957. + // SettingsDeleteProfileGroup('scalingParent\upscaling profiles');
  2958. + STDMETHOD_(BOOL, SettingsCreateProfileGroup)(LPCWSTR path, LPCWSTR settingsPageList, LPCWSTR profileGroupName, LPCWSTR firstProfileName) = 0;
  2959. + STDMETHOD_(BOOL, SettingsDeleteProfileGroup)(LPCWSTR path) = 0;
  2960. +
  2961. + // SettingsAddProfile adds a new profile, using default parameters for all values.
  2962. + // SettingsDuplicateProfile duplicates/copies a profile with all parameters.
  2963. + // Deleting a profile works only if it isn't the only profile left in the group.
  2964. + // Example:
  2965. + // SettingsAddProfile('scalingParent\upscaling profiles', 'SD 60fps');
  2966. + // SettingsDuplicateProfile('scalingParent\upscaling profiles', 'SD 60fps', 'HD 24fps');
  2967. + // SettingsDeleteProfile('scalingParent\upscaling profiles', 'SD 60fps');
  2968. + STDMETHOD_(BOOL, SettingsAddProfile )(LPCWSTR path, LPCWSTR newProfileName) = 0;
  2969. + STDMETHOD_(BOOL, SettingsDuplicateProfile)(LPCWSTR path, LPCWSTR originalProfileName, LPCWSTR newProfileName) = 0;
  2970. + STDMETHOD_(BOOL, SettingsDeleteProfile )(LPCWSTR path, LPCWSTR profileName ) = 0;
  2971. +
  2972. + // SettingsActivateProfile activates the specified profile.
  2973. + // It also disables automatic (rule based) profile selection.
  2974. + // SettingsAutoselectProfile allows you to reactivate it.
  2975. + // Example:
  2976. + // if SettingsIsProfileActive('scalingParent\upscaling profiles', 'SD 24fps') then
  2977. + // begin
  2978. + // SettingsActivateProfile('scalingParent\upscaling profiles', 'SD 60fps');
  2979. + // [...]
  2980. + // SettingsAutoselectProfile('scalingParent\upscaling profiles');
  2981. + STDMETHOD_(BOOL, SettingsIsProfileActive)(LPCWSTR path, LPCWSTR profileName) = 0;
  2982. + STDMETHOD_(BOOL, SettingsActivateProfile)(LPCWSTR path, LPCWSTR profileName) = 0;
  2983. + STDMETHOD_(BOOL, SettingsIsProfileAutoselected)(LPCWSTR path) = 0;
  2984. + STDMETHOD_(BOOL, SettingsAutoselectProfile)(LPCWSTR path) = 0;
  2985. +};
  2986. +
  2987. +// available settings: id, name, type, valid values
  2988. +// ------------------------------------------------
  2989. +// devices, devices
  2990. +// %monitorId%, %monitorName%
  2991. +// %id%, identification
  2992. +// edid, edid, binary
  2993. +// monitorName, monitor name, string
  2994. +// deviceId, device id, string
  2995. +// outputDevice, output device, string
  2996. +// properties, properties
  2997. +// levels, levels, string, TV Levels|PC Levels|Custom
  2998. +// black, black, integer, 0..48
  2999. +// white, white, integer, 200..255
  3000. +// displayBitdepth, native display bitdepth, integer, 6..10
  3001. +// calibration, calibration
  3002. +// calibrate, calibrate display, string, disable calibration controls for this display|this display is already calibrated|calibrate this display by using yCMS|calibrate this display by using an external 3dlut file
  3003. +// disableGpuGammaRamps, disable GPU gamma ramps, boolean
  3004. +// external3dlutFile, external 3dlut file, string
  3005. +// gamutMeasurements, gamut measurements, string
  3006. +// gammaMeasurements, gamma measurements, string
  3007. +// displayPrimaries, display primaries, string, BT.709 (HD)|BT.601 (SD)|PAL|something else
  3008. +// displayGammaCurve, display gamma curve, string, pure power curve|BT.709/601 curve|something else
  3009. +// displayGammaValue, display gamma value, string, 1.80|1.85|1.90|1.95|2.00|2.05|2.10|2.15|2.20|2.25|2.30|2.35|2.40|2.45|2.50|2.55|2.60|2.65|2.70|2.75|2.80
  3010. +// displayModes, display modes
  3011. +// enableDisplayModeChanger, switch to matching display mode..., boolean
  3012. +// changeDisplayModeOnPlay, ... when playback starts, boolean
  3013. +// restoreDisplayMode, restore original display mode..., boolean
  3014. +// restoreDisplayModeOnClose, ... when media player is closed, boolean
  3015. +// slowdown, treat 25p movies as 24p (requires Reclock), boolean
  3016. +// displayModesData, display modes data, binary
  3017. +// colorGamma, color & gamma
  3018. +// brightness, brightness, integer, -100..+100
  3019. +// contrast, contrast, integer, -100..+100
  3020. +// saturation, saturation, integer, -100..+100
  3021. +// hue, hue, integer, -180..+180
  3022. +// enableGammaProcessing, enable gamma processing, boolean
  3023. +// currentGammaCurve, current gamma curve, string, pure power curve|BT.709/601 curve
  3024. +// currentGammaValue, current gamma value, string, 1.80|1.85|1.90|1.95|2.00|2.05|2.10|2.15|2.20|2.25|2.30|2.35|2.40|2.45|2.50|2.55|2.60|2.65|2.70|2.75|2.80
  3025. +// processing, processing
  3026. +// decoding, processing
  3027. +// decodeH264, decode h264, string, disable|libav|intel|hardware
  3028. +// decodeVc1, decode VC-1, string, disable|libav|intel|hardware
  3029. +// decodeMpeg2, decode MPEG2, string, disable|libav|intel|hardware
  3030. +// deinterlacing, deinterlacing
  3031. +// autoActivateDeinterlacing, automatically activate deinterlacing when needed, boolean
  3032. +// ifInDoubtDeinterlace, if in doubt, activate deinterlacing, boolean
  3033. +// contentType, source type, string, auto|film|video
  3034. +// scanPartialFrame, only look at pixels in the frame center, boolean
  3035. +// deinterlaceThread, perform deinterlacing in separate thread, boolean
  3036. +// artifactRemoval, artifact removal
  3037. +// debandActive, reduce banding artifacts, boolean
  3038. +// debandLevel, default debanding strength, integer, 0..2
  3039. +// debandFadeLevel, strength during fade in/out, integer, 0..2
  3040. +// scalingParent, scaling algorithms
  3041. +// chromaUp, chroma upscaling
  3042. +// chromaUp, chroma upsampling, string, Nearest Neighbor|Bilinear|Mitchell-Netravali|Catmull-Rom|Bicubic50|Bicubic60|Bicubic75|Bicubic100|SoftCubic50|SoftCubic60|SoftCubic70|SoftCubic80|SoftCubic100|Lanczos3|Lanczos4|Lanczos8|Spline36|Spline64|Jinc3|Jinc4|Jinc8|Nnedi16|Nnedi32|Nnedi64|Nnedi128|Nnedi256
  3043. +// chromaAntiRinging, activate anti-ringing filter for chroma upsampling, boolean
  3044. +// imageDoubling, image doubling
  3045. +// nnediDLEnable, use NNEDI3 to double Luma resolution, boolean
  3046. +// nnediDCEnable, use NNEDI3 to double Chroma resolution, boolean
  3047. +// nnediQLEnable, use NNEDI3 to quadruple Luma resolution, boolean
  3048. +// nnediQCEnable, use NNEDI3 to quadruple Chroma resolution, boolean
  3049. +// nnediDLScalingFactor, when to use NNEDI3 to double Luma resolution, string, 1.2x|1.5x|2.0x|always
  3050. +// nnediDCScalingFactor, when to use NNEDI3 to double Chroma resolution, string, 1.2x|1.5x|2.0x|always
  3051. +// nnediQLScalingFactor, when to use NNEDI3 to quadruple Luma resolution, string, 1.2x|1.5x|2.0x|always
  3052. +// nnediQCScalingFactor, when to use NNEDI3 to quadruple Chroma resolution, string, 1.2x|1.5x|2.0x|always
  3053. +// nnediDLQuality, NNEDI3 double Luma quality, integer, 0..4
  3054. +// nnediDLQuality, NNEDI3 double Chroma quality, integer, 0..4
  3055. +// nnediDLQuality, NNEDI3 quadruple Luma quality, integer, 0..4
  3056. +// nnediDLQuality, NNEDI3 quadruple Chroma quality, integer, 0..4
  3057. +// lumaUp, image upscaling
  3058. +// lumaUp, image upscaling, string, Nearest Neighbor|Bilinear|Dxva|Mitchell-Netravali|Catmull-Rom|Bicubic50|Bicubic60|Bicubic75|Bicubic100|SoftCubic50|SoftCubic60|SoftCubic70|SoftCubic80|SoftCubic100|Lanczos3|Lanczos4|Lanczos8|Spline36|Spline64|Jinc3|Jinc4|Jinc8
  3059. +// lumaUpAntiRinging, activate anti-ringing filter for luma upsampling, boolean
  3060. +// lumaUpLinear, upscale luma in linear light, boolean
  3061. +// lumaDown, image downscaling
  3062. +// lumaDown, image downscaling, string, Nearest Neighbor|Bilinear|Dxva|Mitchell-Netravali|Catmull-Rom|Bicubic50|Bicubic60|Bicubic75|Bicubic100|SoftCubic50|SoftCubic60|SoftCubic70|SoftCubic80|SoftCubic100|Lanczos3|Lanczos4|Lanczos8|Spline36|Spline64
  3063. +// lumaDownAntiRinging, activate anti-ringing filter for luma downsampling, boolean
  3064. +// lumaDownLinear, downscale luma in linear light, boolean
  3065. +// rendering, rendering
  3066. +// basicRendering, general settings
  3067. +// managedUpload, use managed upload textures (XP only), boolean
  3068. +// uploadInRenderThread, upload frames in render thread, boolean
  3069. +// delayPlaybackStart2, delay playback start until render queue is full, boolean
  3070. +// delaySeek, delay playback start after seeking, too, boolean
  3071. +// enableOverlay, enable windowed overlay (Windows 7 and newer), boolean
  3072. +// enableExclusive, enable automatic fullscreen exclusive mode, boolean
  3073. +// disableAero, disable desktop composition (Vista and newer), boolean
  3074. +// disableAeroCfg, disable desktop composition configuration, string, during exclusive - windowed mode switch|while madVR is in exclusive mode|while media player is in fullscreen mode|always
  3075. +// splitNv12ViaOpenCL, use OpenCL to process DXVA NV12 surfaces (Intel, AMD), boolean
  3076. +// separateDevice, use a separate device for presentation (Vista and newer), boolean
  3077. +// useD3d11, use D3D11 for presentation, boolean
  3078. +// dxvaDevice, use separate device for DXVA processing (Vista and newer), boolean
  3079. +// cpuQueueSize, CPU queue size, integer, 4..32
  3080. +// gpuQueueSize, GPU queue size, integer, 4..24
  3081. +// windowedTweaks, windowed mode settings
  3082. +// backbufferCount, no of backbuffers, integer, 1..8
  3083. +// flushAfterRenderSteps, after render steps, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3084. +// flushAfterLastStep, after last step, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3085. +// flushAfterBackbuffer, after backbuffer, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3086. +// flushAfterPresent, after present, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3087. +// exclusiveSettings, exclusive mode settings
  3088. +// enableSeekbar, show seek bar, boolean
  3089. +// exclusiveDelay, delay switch to exclusive mode by 3 seconds, boolean
  3090. +// oldExclusivePath, use old rendering path, boolean
  3091. +// presentThread, run presentation in a separate thread, boolean
  3092. +// avoidGlitches, limit rendering times to avoid glitches, boolean
  3093. +// overshootMaxLatency, overshoot max frame latency (Vista and newer), boolean
  3094. +// preRenderFrames, no of pre-presented frames, integer, 1..16
  3095. +// backbufferCountExcl, no of backbuffers, integer, 1..8
  3096. +// flushAfterRenderStepsExcl, after render steps, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3097. +// flushAfterLastStepExcl, after last step, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3098. +// flushAfterBackbufferExcl, after backbuffer, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3099. +// flushAfterPresentExcl, after present, string, don''t flush|flush|flush & wait (sleep)|flush & wait (loop)
  3100. +// smoothMotion, smooth motion
  3101. +// smoothMotionEnabled, enable smooth motion frame rate conversion, boolean
  3102. +// smoothMotionMode, smooth motion mode, string, avoidJudder|almostAlways|always
  3103. +// tradeQuality, trade quality for performance
  3104. +// fastSubtitles, optimize subtitles for performance instead of quality, boolean
  3105. +// customShaders16f, store custom pixel shader results in 16bit buffer instead of 32bit, boolean
  3106. +// noErrorDif, use random dithering instead of OpenCL error diffusion, boolean
  3107. +// noGradientAngles, don't analyze gradient angles for debanding, boolean
  3108. +// dontRerenderFades, don't rerender frames when fade in/out is detected, boolean
  3109. +// noDeintCopyback, don't use "copyback" for DXVA deinterlacing, boolean
  3110. +// noDecodeCopyback, don't use "copyback" for DXVA decoding, boolean
  3111. +// gammaBlending, don't use linear light for smooth motion frame blending, boolean
  3112. +// 10bitChroma, use 10bit chroma buffer instead of 16bit, boolean
  3113. +// 10bitLuma, use 10bit image buffer instead of 16bit, boolean
  3114. +// customShadersTv, run custom pixel shaders in video levels instead of PC levels, boolean
  3115. +// 3dlutLowerBitdepth, use lower bitdepth for yCMS 3dlut calibration, boolean
  3116. +// 3dlutBitdepth, 3dlut bitdepth, integer, 6..7
  3117. +// halfDxvaDeintFramerate, use half frame rate for DXVA deinterlacing, boolean
  3118. +// dontDither, don't use dithering, boolean
  3119. +// ui, user interface
  3120. +// keys, keyboard shortcuts
  3121. +// keysOnlyIfFocused, use only if media player has keyboard focus, boolean
  3122. +// keyDebugOsd, debug OSD - toggle on/off, string
  3123. +// keyResetStats, debug OSD - reset statistics, string
  3124. +// keyFreezeReport, create freeze report, string
  3125. +// keyOutputLevels, output levels - toggle, string
  3126. +// keySourceLevels, source levels - toggle, string
  3127. +// keySourceBlackInc, source black level - increase, string
  3128. +// keySourceBlackDec, source black level - decrease, string
  3129. +// keySourceWhiteInc, source white level - increase, string
  3130. +// keySourceWhiteDec, source white level - decrease, string
  3131. +// keySourceBrightnessInc, source brightness - increase, string
  3132. +// keySourceBrightnessDec, source brightness - decrease, string
  3133. +// keySourceContrastInc, source contrast - increase, string
  3134. +// keySourceContrastDec, source contrast - decrease, string
  3135. +// keySourceSaturationInc, source saturation - increase, string
  3136. +// keySourceSaturationDec, source saturation - decrease, string
  3137. +// keySourceHueInc, source hue - increase, string
  3138. +// keySourceHueDec, source hue - decrease, string
  3139. +// keySourceColorControlReset, source color control - reset, string
  3140. +// keyMatrix, source decoding matrix - toggle, string
  3141. +// keyPrimaries, source primaries - toggle, string
  3142. +// keyPrimariesEbu, source primaries - set to "EBU/PAL", string
  3143. +// keyPrimaries709, source primaries - set to "BT.709", string
  3144. +// keyPrimariesSmpteC, source primaries - set to "SMPTE C", string
  3145. +// keyPrimaries2020, source primaries - set to "BT.2020", string
  3146. +// keyPrimariesDci, source primaries - set to "DCI-P3", string
  3147. +// keyDeint, deinterlacing - toggle, string
  3148. +// keyDeintFieldOrder, deinterlacing field order - toggle, string
  3149. +// keyDeintContentType, deinterlacing content type - toggle, string
  3150. +// keyDeintContentTypeFilm, deinterlacing content type - set to "film", string
  3151. +// keyDeintContentTypeVideo, deinterlacing content type - set to "video", string
  3152. +// keyDeintContentTypeAuto, deinterlacing content type - set to "auto detect", string
  3153. +// keyDeband, debanding - toggle, string
  3154. +// keyDebandCustom, debanding custom settings - toggle, string
  3155. +// keyDesiredGammaCurve, desired display gamma curve - toggle, string
  3156. +// keyDesiredGammaValueInc, desired display gamma value - increase, string
  3157. +// keyDesiredGammaValueDec, desired display gamma value - decrease, string
  3158. +// keyFseEnable, automatic fullscreen exclusive mode - enable, string
  3159. +// keyFseDisable, automatic fullscreen exclusive mode - disable, string
  3160. +// keyFseDisable10, automatic fullscreen exclusive mode - disable for 10 seconds, string
  3161. +// keyEnableSmoothMotion, enable smooth motion frame rate conversion, string
  3162. +// keyDisableSmoothMotion, disable smooth motion frame rate conversion, string
  3163. +// keyChromaAlgo, chroma upscaling algorithm - toggle, string
  3164. +// keyChromaAlgoNearest, chroma upscaling algorithm - set to "Nearest Neighbor", string
  3165. +// keyChromaAlgoBilinear, chroma upscaling algorithm - set to "Bilinear", string
  3166. +// keyChromaAlgoMitchell, chroma upscaling algorithm - set to "Mitchell-Netravali", string
  3167. +// keyChromaAlgoCatmull, chroma upscaling algorithm - set to "Catmull-Rom", string
  3168. +// keyChromaAlgoBicubic, chroma upscaling algorithm - set to "Bicubic", string
  3169. +// keyChromaAlgoSoftCubic, chroma upscaling algorithm - set to "SoftCubic", string
  3170. +// keyChromaAlgoLanczos, chroma upscaling algorithm - set to "Lanczos", string
  3171. +// keyChromaAlgoSpline, chroma upscaling algorithm - set to "Spline", string
  3172. +// keyChromaAlgoJinc, chroma upscaling algorithm - set to "Jinc", string
  3173. +// keyChromaAlgoParamInc, chroma upscaling algorithm parameter - increase, string
  3174. +// keyChromaAlgoParamDec, chroma upscaling algorithm parameter - decrease, string
  3175. +// keyChromaAntiRing, chroma upscaling anti-ringing filter - toggle on/off, string
  3176. +// keyImageUpAlgo, image upscaling algorithm - toggle, string
  3177. +// keyImageUpAlgoNearest, image upscaling algorithm - set to "Nearest Neighbor", string
  3178. +// keyImageUpAlgoBilinear, image upscaling algorithm - set to "Bilinear", string
  3179. +// keyImageUpAlgoDxva, image upscaling algorithm - set to "DXVA2", string
  3180. +// keyImageUpAlgoMitchell, image upscaling algorithm - set to "Mitchell-Netravali", string
  3181. +// keyImageUpAlgoCatmull, image upscaling algorithm - set to "Catmull-Rom", string
  3182. +// keyImageUpAlgoBicubic, image upscaling algorithm - set to "Bicubic", string
  3183. +// keyImageUpAlgoSoftCubic, image upscaling algorithm - set to "SoftCubic", string
  3184. +// keyImageUpAlgoLanczos, image upscaling algorithm - set to "Lanczos", string
  3185. +// keyImageUpAlgoSpline, image upscaling algorithm - set to "Spline", string
  3186. +// keyImageUpAlgoJinc, image upscaling algorithm - set to "Jinc", string
  3187. +// keyImageUpAlgoParamInc, image upscaling algorithm parameter - increase, string
  3188. +// keyImageUpAlgoParamDec, image upscaling algorithm parameter - decrease, string
  3189. +// keyImageUpAntiRing, image upscaling anti-ringing filter - toggle on/off, string
  3190. +// keyImageUpLinear, image upscaling in linear light - toggle on/off, string
  3191. +// keyImageDownAlgo, image downscaling algorithm - toggle, string
  3192. +// keyImageDownAlgoNearest, image downscaling algorithm - set to "Nearest Neighbor", string
  3193. +// keyImageDownAlgoBilinear, image downscaling algorithm - set to "Bilinear", string
  3194. +// keyImageDownAlgoDxva, image downscaling algorithm - set to "DXVA2", string
  3195. +// keyImageDownAlgoMitchell, image downscaling algorithm - set to "Mitchell-Netravali", string
  3196. +// keyImageDownAlgoCatmull, image downscaling algorithm - set to "Catmull-Rom", string
  3197. +// keyImageDownAlgoBicubic, image downscaling algorithm - set to "Bicubic", string
  3198. +// keyImageDownAlgoSoftCubic, image downscaling algorithm - set to "SoftCubic", string
  3199. +// keyImageDownAlgoLanczos, image downscaling algorithm - set to "Lanczos", string
  3200. +// keyImageDownAlgoSpline, image downscaling algorithm - set to "Spline", string
  3201. +// keyImageDownAlgoParamInc, image downscaling algorithm parameter - increase, string
  3202. +// keyImageDownAlgoParamDec, image downscaling algorithm parameter - decrease, string
  3203. +// keyImageDownAntiRing, image downscaling anti-ringing filter - toggle on/off, string
  3204. +// keyImageDownLinear, image downscaling in linear light - toggle on/off, string
  3205. +// keyDisplayModeChanger, display mode switcher - toggle on/off, string
  3206. +// keyDisplayBitdepth, display bitdepth - toggle, string
  3207. +// keyDithering, dithering - toggle on/off, string
  3208. +// keyErrorDif, error diffusion - toggle on/off, string
  3209. +
  3210. +// profile settings: id, name, type, valid values
  3211. +// ----------------------------------------------
  3212. +// Profile Group 1
  3213. +// keyToggleProfiles, keyboard shortcut to toggle profiles, string
  3214. +// autoselectRules, profile auto select rules, string
  3215. +// Profile 1
  3216. +// keyActivateProfile, keyboard shortcut to activate this profile, string
  3217. +// activateCmdline, command line to execute when this profile is activated, string
  3218. +// deactivateCmdline, command line to execute when this profile is deactivated, string
  3219. +
  3220. +// ---------------------------------------------------------------------------
  3221. +// ISubRender
  3222. +// ---------------------------------------------------------------------------
  3223. +
  3224. +// the "ISubRender" interface is used by the internal subtitle rendering
  3225. +// engine in MPC-HC and PotPlayer for communication with madVR and with the
  3226. +// Haali Video Renderer
  3227. +
  3228. +interface ISubRenderCallback; // forward
  3229. +#if defined(HAS_DS_PLAYER)
  3230. +#else
  3231. +// interface exported by madVR
  3232. +[uuid("9CC7F9F7-3ED1-493c-AF65-527EA1D9947F")]
  3233. +interface ISubRender : public IUnknown
  3234. +{
  3235. + STDMETHOD(SetCallback)(ISubRenderCallback *callback) = 0;
  3236. +};
  3237. +
  3238. +// callback interfaces can provide madVR with
  3239. +[uuid("CD6D2AA5-20D3-4ebe-A8A9-34D3B00CC253")]
  3240. +interface ISubRenderCallback : public IUnknown
  3241. +{
  3242. + STDMETHOD(SetDevice)(IDirect3DDevice9 *device) = 0;
  3243. + STDMETHOD(Render)(REFERENCE_TIME frameStart, int left, int top, int right, int bottom, int width, int height) = 0;
  3244. +};
  3245. +[uuid("E602585E-C05A-4828-AC69-AF92997F2E0C")]
  3246. +interface ISubRenderCallback2 : public ISubRenderCallback
  3247. +{
  3248. + STDMETHOD(RenderEx)(REFERENCE_TIME frameStart, REFERENCE_TIME frameStop, REFERENCE_TIME avgTimePerFrame, int left, int top, int right, int bottom, int width, int height) = 0;
  3249. +};
  3250. +#endif
  3251. +// ---------------------------------------------------------------------------
  3252. +// IMadVRExclusiveModeInfo (obsolete)
  3253. +// ---------------------------------------------------------------------------
  3254. +
  3255. +// CAUTION: This interface is obsolete. Use IMadVRInfo instead:
  3256. +// IMadVRInfo::InfoGetBoolean("ExclusiveModeActive")
  3257. +// IMadVRInfo::InfoGetBoolean("MadVRSeekbarEnabled")
  3258. +
  3259. +// this interface allows you to ask...
  3260. +// ... whether madVR is currently in exclusive mode
  3261. +// ... whether the madVR exclusive mode seek bar is currently enabled
  3262. +
  3263. +// If madVR is in fullscreen exclusive mode, you should be careful with
  3264. +// which GUI you show, because showing any window based GUI will make madVR
  3265. +// automatically switch back to windowed mode. That's ok if that's what you
  3266. +// really want, just be aware of that. A good alternative is to use the
  3267. +// graphical or text base OSD interfaces (see above). Using them instead of
  3268. +// a window based GUI means that madVR can stay in exclusive mode all the
  3269. +// time.
  3270. +
  3271. +// Since madVR has its own seek bar (which is only shown in fullscreen
  3272. +// exclusive mode, though), before showing your own seek bar you should
  3273. +// check whether madVR is in fullscreen exclusive mode and whether the
  3274. +// user has enabled madVR's own seek bar. If so, you should probably not
  3275. +// show your own seek bar. If the user, however, has the madVR seek bar
  3276. +// disabled, you should still show your own seek bar, because otherwise
  3277. +// the user will have no way to seek at all.
  3278. +
  3279. +[uuid("D6EE8031-214E-4E9E-A3A7-458925F933AB")]
  3280. +interface IMadVRExclusiveModeInfo : public IUnknown
  3281. +{
  3282. + STDMETHOD_(BOOL, IsExclusiveModeActive)(void) = 0;
  3283. + STDMETHOD_(BOOL, IsMadVRSeekbarEnabled)(void) = 0;
  3284. +};
  3285. +
  3286. +// ---------------------------------------------------------------------------
  3287. +// IMadVRRefreshRateInfo (obsolete)
  3288. +// ---------------------------------------------------------------------------
  3289. +
  3290. +// CAUTION: This interface is obsolete. Use IMadVRInfo instead:
  3291. +// IMadVRInfo::InfoGetDouble("RefreshRate")
  3292. +
  3293. +// this interface allows you to ask madVR about the detected refresh rate
  3294. +
  3295. +[uuid("3F6580E8-8DE9-48D0-8E4E-1F26FE02413E")]
  3296. +interface IMadVRRefreshRateInfo : public IUnknown
  3297. +{
  3298. + STDMETHOD(GetRefreshRate)(double *refreshRate) = 0;
  3299. +};
  3300. +
  3301. +// ---------------------------------------------------------------------------
  3302. +
  3303. +#endif // __mvrInterfaces__
  3304. diff --git a/xbmc/cores/DSPlayer/GraphFilters.cpp b/xbmc/cores/DSPlayer/GraphFilters.cpp
  3305. index e3079d1..92c6439 100644
  3306. --- a/xbmc/cores/DSPlayer/GraphFilters.cpp
  3307. +++ b/xbmc/cores/DSPlayer/GraphFilters.cpp
  3308. @@ -31,6 +31,7 @@ CGraphFilters *CGraphFilters::m_pSingleton = NULL;
  3309. CGraphFilters::CGraphFilters():
  3310. m_isDVD(false), m_UsingDXVADecoder(false), m_CurrentRenderer(DIRECTSHOW_RENDERER_UNDEF)
  3311. {
  3312. + m_pMadvr = NULL;
  3313. }
  3314.  
  3315. CGraphFilters::~CGraphFilters()
  3316. diff --git a/xbmc/cores/DSPlayer/GraphFilters.h b/xbmc/cores/DSPlayer/GraphFilters.h
  3317. index 7f6c17d..75155fa 100644
  3318. --- a/xbmc/cores/DSPlayer/GraphFilters.h
  3319. +++ b/xbmc/cores/DSPlayer/GraphFilters.h
  3320. @@ -29,6 +29,7 @@
  3321.  
  3322. #include "DSUtil/DSUtil.h"
  3323. #include "DSUtil/SmartPtr.h"
  3324. +#include "IPaintCallback.h"
  3325. #include "streams.h"
  3326. #include "utils/CharsetConverter.h"
  3327. #include "system.h"
  3328. @@ -109,7 +110,8 @@ enum DIRECTSHOW_RENDERER
  3329. {
  3330. DIRECTSHOW_RENDERER_VMR9 = 1,
  3331. DIRECTSHOW_RENDERER_EVR = 2,
  3332. - DIRECTSHOW_RENDERER_UNDEF = 3
  3333. + DIRECTSHOW_RENDERER_MADVR = 3,
  3334. + DIRECTSHOW_RENDERER_UNDEF = 4
  3335. };
  3336.  
  3337. /** @brief Centralize graph filters management
  3338. @@ -154,6 +156,9 @@ public:
  3339. /// @return The current renderer type (EVR or VMR9)
  3340. DIRECTSHOW_RENDERER GetCurrentRenderer() { return m_CurrentRenderer; }
  3341.  
  3342. + IPaintCallbackMadvr* GetMadvrCallback() { return m_pMadvr;}
  3343. +
  3344. +
  3345. /// @return True if using DXVA, false otherwise
  3346. bool IsUsingDXVADecoder() { return m_UsingDXVADecoder; }
  3347.  
  3348. @@ -163,13 +168,13 @@ public:
  3349. void SetIsUsingDXVADecoder(bool val) { m_UsingDXVADecoder = val; }
  3350. void SetIsDVD(bool val) { m_isDVD = val; }
  3351. void SetCurrentRenderer(DIRECTSHOW_RENDERER renderer) { m_CurrentRenderer = renderer; }
  3352. -
  3353. + void SetMadVrCallback(IPaintCallbackMadvr* pMadvr) { m_pMadvr = pMadvr;}
  3354. private:
  3355. CGraphFilters();
  3356. ~CGraphFilters();
  3357.  
  3358. static CGraphFilters* m_pSingleton;
  3359. -
  3360. + IPaintCallbackMadvr* m_pMadvr;
  3361. bool m_isDVD;
  3362. bool m_UsingDXVADecoder;
  3363. DIRECTSHOW_RENDERER m_CurrentRenderer;
  3364. diff --git a/xbmc/cores/DSPlayer/IPaintCallback.h b/xbmc/cores/DSPlayer/IPaintCallback.h
  3365. index 3dcf651..dfad11d 100644
  3366. --- a/xbmc/cores/DSPlayer/IPaintCallback.h
  3367. +++ b/xbmc/cores/DSPlayer/IPaintCallback.h
  3368. @@ -24,7 +24,7 @@
  3369. #ifndef HAS_DS_PLAYER
  3370. #error DSPlayer's header file included without HAS_DS_PLAYER defined
  3371. #endif
  3372. -
  3373. +#include "guilib/Geometry.h"
  3374. class IPaintCallback
  3375. {
  3376. public:
  3377. @@ -34,3 +34,11 @@ public:
  3378. virtual void OnAfterPresent() = 0;
  3379. };
  3380.  
  3381. +class IPaintCallbackMadvr
  3382. +{
  3383. +public:
  3384. + virtual ~IPaintCallbackMadvr() {};
  3385. +
  3386. + virtual bool IsReady() = 0;
  3387. + virtual bool StartBack() = 0;
  3388. +};
  3389. \ No newline at end of file
  3390. diff --git a/xbmc/cores/DSPlayer/moreuuids.h b/xbmc/cores/DSPlayer/moreuuids.h
  3391. index 3bcf640..5092d61 100644
  3392. --- a/xbmc/cores/DSPlayer/moreuuids.h
  3393. +++ b/xbmc/cores/DSPlayer/moreuuids.h
  3394. @@ -395,8 +395,9 @@ DEFINE_GUID(MEDIASUBTYPE_PS2_SUB,
  3395. DEFINE_GUID(CLSID_DXR,
  3396. 0x760a8f35, 0x97e7, 0x479d, 0xaa, 0xf5, 0xda, 0x9e, 0xff, 0x95, 0xd7, 0x51);
  3397.  
  3398. -DEFINE_GUID(CLSID_madVR,
  3399. - 0xe1a8b82a, 0x32ce, 0x4b0d, 0xbe, 0x0d, 0xaa, 0x68, 0xc7, 0x72, 0xe4, 0x23);
  3400. +/* already defined in mvrinterfaces.h
  3401. +DEFINE_GUID(CLSID_madVR, 0xe1a8b82a, 0x32ce, 0x4b0d, 0xbe, 0x0d, 0xaa, 0x68, 0xc7, 0x72, 0xe4, 0x23);
  3402. +*/
  3403.  
  3404. //
  3405. // Ogg
  3406. diff --git a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
  3407. index fcc779d..6dc8c65 100644
  3408. --- a/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
  3409. +++ b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp
  3410. @@ -89,10 +89,19 @@ IPlayer* CPlayerCoreFactory::CreatePlayer(const CStdString& strCore, IPlayerCall
  3411. IPlayer* CPlayerCoreFactory::CreatePlayer(const PLAYERCOREID eCore, IPlayerCallback& callback) const
  3412. {
  3413. CSingleLock lock(m_section);
  3414. +
  3415. + for (int i = 0 ; i < m_vecCoreConfigs.size();i++)
  3416. + {
  3417. + if (m_vecCoreConfigs[i]->GetType() == eCore)
  3418. + return m_vecCoreConfigs[i]->CreatePlayer(callback);
  3419. + }
  3420. + return NULL;
  3421. + /*dont know why this crap dont work for me
  3422. if (m_vecCoreConfigs.empty() || eCore-1 > m_vecCoreConfigs.size()-1)
  3423. return NULL;
  3424. -
  3425. +
  3426. return m_vecCoreConfigs[eCore-1]->CreatePlayer(callback);
  3427. + */
  3428. }
  3429.  
  3430. PLAYERCOREID CPlayerCoreFactory::GetPlayerCore(const CStdString& strCoreName) const
  3431. @@ -362,6 +371,9 @@ bool CPlayerCoreFactory::LoadConfiguration(const std::string &file, bool clear)
  3432. CPlayerCoreConfig* dsplayer = new CPlayerCoreConfig("DSPlayer", EPC_DSPLAYER, NULL);
  3433. dsplayer->m_bPlaysAudio = dsplayer->m_bPlaysVideo = true;
  3434. m_vecCoreConfigs.push_back(dsplayer);
  3435. + /*added those to fix the problem with the id of the player*/
  3436. + m_vecCoreConfigs.push_back(dsplayer);
  3437. + m_vecCoreConfigs.push_back(dsplayer);
  3438. #endif
  3439. for(std::vector<CPlayerSelectionRule *>::iterator it = m_vecCoreSelectionRules.begin(); it != m_vecCoreSelectionRules.end(); ++it)
  3440. delete *it;
  3441. diff --git a/xbmc/rendering/dx/RenderSystemDX.cpp b/xbmc/rendering/dx/RenderSystemDX.cpp
  3442. index 83097d9..e6b301a 100644
  3443. --- a/xbmc/rendering/dx/RenderSystemDX.cpp
  3444. +++ b/xbmc/rendering/dx/RenderSystemDX.cpp
  3445. @@ -41,6 +41,7 @@
  3446. #include "Util.h"
  3447. #include "win32/WIN32Util.h"
  3448. #include "video/VideoReferenceClock.h"
  3449. +#include "cores/DSPlayer/GraphFilters.h"
  3450. #if (D3DX_SDK_VERSION >= 42) //aug 2009 sdk and up use dxerr
  3451. #include <Dxerr.h>
  3452. #else
  3453. @@ -777,7 +778,13 @@ bool CRenderSystemDX::ClearBuffers(color_t color)
  3454. if (!m_bRenderCreated)
  3455. return false;
  3456.  
  3457. - if( FAILED( hr = m_pD3DDevice->Clear(
  3458. + /*MADVR*/
  3459. + if ((CGraphFilters::Get()->GetCurrentRenderer() == DIRECTSHOW_RENDERER_MADVR)&&(CGraphFilters::Get()->GetMadvrCallback() != NULL))
  3460. + {
  3461. + }
  3462. + else
  3463. + {
  3464. + if( FAILED( hr = m_pD3DDevice->Clear(
  3465. 0,
  3466. NULL,
  3467. D3DCLEAR_TARGET,
  3468. @@ -785,6 +792,9 @@ bool CRenderSystemDX::ClearBuffers(color_t color)
  3469. 1.0,
  3470. 0 ) ) )
  3471. return false;
  3472. + }
  3473. +
  3474. +
  3475.  
  3476. return true;
  3477. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!