Some more libmythtv/mheg changes to std::chrono. (42)

MythTV · Jan 25, 2021 · 3057302 · 3057302
1 parent 150653a
commit 3057302
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/mythtv/libs/libmythfreemheg/Stream.cpp b/mythtv/libs/libmythfreemheg/Stream.cpp
@@ -230,19 +230,19 @@ void MHStream::StopPlaying(MHEngine *engine)
 void MHStream::GetCounterPosition(MHRoot *pResult, MHEngine *engine)
 {
     // StreamCounterUnits (mS)
-    pResult->SetVariableValue((int)engine->GetContext()->GetStreamPos());
+    pResult->SetVariableValue((int)engine->GetContext()->GetStreamPos().count());
 }
 
 void MHStream::GetCounterMaxPosition(MHRoot *pResult, MHEngine *engine)
 {
     // StreamCounterUnits (mS)
-    pResult->SetVariableValue((int)engine->GetContext()->GetStreamMaxPos());
+    pResult->SetVariableValue((int)engine->GetContext()->GetStreamMaxPos().count());
 }
 
 void MHStream::SetCounterPosition(int pos, MHEngine *engine)
 {
     // StreamCounterUnits (mS)
-    engine->GetContext()->SetStreamPos(pos);
+    engine->GetContext()->SetStreamPos(std::chrono::milliseconds(pos));
 }
 
 void MHStream::SetSpeed(int speed, MHEngine *engine)

diff --git a/mythtv/libs/libmythfreemheg/freemheg.h b/mythtv/libs/libmythfreemheg/freemheg.h
@@ -151,11 +151,11 @@ class MHContext
     // Stop displaying video
     virtual void StopVideo() = 0;
     // Get current stream position in mS, -1 if unknown
-    virtual long GetStreamPos() = 0;
+    virtual std::chrono::milliseconds GetStreamPos() = 0;
     // Get current stream size in mS, -1 if unknown
-    virtual long GetStreamMaxPos() = 0;
+    virtual std::chrono::milliseconds GetStreamMaxPos() = 0;
     // Set current stream position in mS
-    virtual long SetStreamPos(long) = 0;
+    virtual std::chrono::milliseconds SetStreamPos(std::chrono::milliseconds) = 0;
     // Play or pause a stream
     virtual void StreamPlay(bool play = true) = 0;
 

diff --git a/mythtv/libs/libmythtv/mheg/mhi.cpp b/mythtv/libs/libmythtv/mheg/mhi.cpp
@@ -1143,24 +1143,24 @@ void MHIContext::StopVideo()
 }
 
 // Get current stream position, -1 if unknown
-long MHIContext::GetStreamPos()
+std::chrono::milliseconds MHIContext::GetStreamPos()
 {
-    return m_parent->GetPlayer() ? m_parent->GetPlayer()->GetStreamPos().count() : -1;
+    return m_parent->GetPlayer() ? m_parent->GetPlayer()->GetStreamPos() : -1ms;
 }
 
 // Get current stream size, -1 if unknown
-long MHIContext::GetStreamMaxPos()
+std::chrono::milliseconds MHIContext::GetStreamMaxPos()
 {
-    return m_parent->GetPlayer() ? m_parent->GetPlayer()->GetStreamMaxPos().count() : -1;
+    return m_parent->GetPlayer() ? m_parent->GetPlayer()->GetStreamMaxPos() : -1ms;
 }
 
 // Set current stream position
-long MHIContext::SetStreamPos(long pos)
+std::chrono::milliseconds MHIContext::SetStreamPos(std::chrono::milliseconds pos)
 {
     if (m_parent->GetPlayer())
-        emit m_parent->GetPlayer()->SetInteractiveStreamPos(std::chrono::seconds(pos));
+        emit m_parent->GetPlayer()->SetInteractiveStreamPos(pos);
     // Note: return value is never used
-    return 0;
+    return 0ms;
 }
 
 // Play or pause a stream

diff --git a/mythtv/libs/libmythtv/mheg/mhi.h b/mythtv/libs/libmythtv/mheg/mhi.h
@@ -130,11 +130,11 @@ class MHIContext : public MHContext, public QRunnable
     /// Stop displaying video
     void StopVideo() override; // MHContext
     // Get current stream position, -1 if unknown
-    long GetStreamPos() override; // MHContext
+    std::chrono::milliseconds GetStreamPos() override; // MHContext
     // Get current stream size, -1 if unknown
-    long GetStreamMaxPos() override; // MHContext
+    std::chrono::milliseconds GetStreamMaxPos() override; // MHContext
     // Set current stream position
-    long SetStreamPos(long pos) override; // MHContext
+    std::chrono::milliseconds SetStreamPos(std::chrono::milliseconds pos) override; // MHContext
     // Play or pause a stream
     void StreamPlay(bool play) override; // MHContext
 

diff --git a/mythtv/libs/libmythtv/mythplayercaptionsui.h b/mythtv/libs/libmythtv/mythplayercaptionsui.h
@@ -13,7 +13,7 @@ class MTV_PUBLIC MythPlayerCaptionsUI : public MythPlayerAudioUI
     void CaptionsStateChanged(MythCaptionsState& CaptionsState);
     void ResizeForInteractiveTV(const QRect& Rect);
     void SetInteractiveStream(const QString& Stream);
-    void SetInteractiveStreamPos(std::chrono::seconds Position);
+    void SetInteractiveStreamPos(std::chrono::milliseconds Position);
     void PlayInteractiveStream(bool Play);
 
   public: