WIN32 compatibility

diff --git a/dssourcefilter.h b/dssourcefilter.h
index ab34c9d238efcda906478b7cd3b18ecdf81ef112..dd163e3bed99a01a9359037ed1a85baf806b533c 100644 (file)
--- a/dssourcefilter.h
+++ b/dssourcefilter.h
@@ -22,7 +22,6 @@
 #define DSSOURCEFILTER_H
 
 
-#include "mutex.h"
 #include "dssourcepin.h"
 
 struct mptype_video_detail{ //here should be all information added the Video Draintarget needs for rendering, to be extended in the future

diff --git a/osdwinvector.h b/osdwinvector.h
index 9a72ca938c50cb297edc7fca231a4472ee7bba5e..058e2051c1a0e5d78b86fc01361bc82ef54ad1ed 100644 (file)
--- a/osdwinvector.h
+++ b/osdwinvector.h
@@ -20,21 +20,20 @@
 #ifndef OSDWINVECTOR_H
 #define OSDWINVECTOR_H
 
-#include <stdio.h>
-#include <d3d10_1.h>
-#include <d2d1.h>
-#include <dwrite.h>
 #include <queue>
 #include <list>
 #include <mutex>
 
-#include "osdvector.h"
 #include "defines.h"
-#include "log.h"
 #include "windowsosd.h"
 
 
+#include <d3d10_1.h>
+#include <d2d1.h>
+#include <dwrite.h>
 
+#include "log.h"
+#include "osdvector.h"
 
 class OsdWinVector : public OsdVector, public WindowsOsd
 {

diff --git a/timers.cc b/timers.cc
index f1f73da3db29ec6cfd745ce11cd565bf7f244770..7caed9beed3d757570d8a267fa648efc4dad0161 100644 (file)
--- a/timers.cc
+++ b/timers.cc
@@ -95,7 +95,8 @@ bool Timers::setTimerD(TimerReceiver* client, int clientReference, long int requ
 {
   std::chrono::system_clock::time_point fireTime = std::chrono::system_clock::now();
   fireTime += std::chrono::seconds(requestedSecs);
-  fireTime += std::chrono::nanoseconds(requestedNSecs);
+  //fireTime += std::chrono::nanoseconds(requestedNSecs);
+  fireTime += std::chrono::duration_cast<std::chrono::seconds>(std::chrono::nanoseconds(requestedNSecs));
 
   return setTimerC(client, clientReference, fireTime);
 }
@@ -103,7 +104,8 @@ bool Timers::setTimerD(TimerReceiver* client, int clientReference, long int requ
 bool Timers::setTimerT(TimerReceiver* client, int clientReference, long int requestedTime, long int requestedTimeNSecs)
 {
   std::chrono::system_clock::time_point fireTime = std::chrono::system_clock::from_time_t(requestedTime);
-  fireTime += std::chrono::nanoseconds(requestedTimeNSecs);
+  //fireTime += std::chrono::nanoseconds(requestedTimeNSecs);
+  fireTime += std::chrono::duration_cast<std::chrono::seconds>(std::chrono::nanoseconds(requestedTimeNSecs));
 
   return setTimerC(client, clientReference, fireTime);
 }