mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-27 07:22:44 +02:00
Merge remote-tracking branch 'tangocash/master'
Origin commit data
------------------
Branch: master
Commit: 4b98c2be24
Author: max_10 <max_10@gmx.de>
Date: 2017-11-12 (Sun, 12 Nov 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -411,6 +411,8 @@ cPlayback::cPlayback(int num)
|
|||||||
|
|
||||||
gst_version (&major, &minor, µ, &nano);
|
gst_version (&major, &minor, µ, &nano);
|
||||||
|
|
||||||
|
gst_mpegts_initialize();
|
||||||
|
|
||||||
if (nano == 1)
|
if (nano == 1)
|
||||||
nano_str = "(CVS)";
|
nano_str = "(CVS)";
|
||||||
else if (nano == 2)
|
else if (nano == 2)
|
||||||
@@ -821,7 +823,6 @@ bool cPlayback::GetPosition(int &position, int &duration)
|
|||||||
if (!GST_CLOCK_TIME_IS_VALID(pts))
|
if (!GST_CLOCK_TIME_IS_VALID(pts))
|
||||||
{
|
{
|
||||||
lt_info( "%s - %d failed\n", __FUNCTION__, __LINE__);
|
lt_info( "%s - %d failed\n", __FUNCTION__, __LINE__);
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -829,7 +830,6 @@ bool cPlayback::GetPosition(int &position, int &duration)
|
|||||||
if(!gst_element_query_position(m_gst_playbin, fmt, &pts))
|
if(!gst_element_query_position(m_gst_playbin, fmt, &pts))
|
||||||
{
|
{
|
||||||
lt_info( "%s - %d failed\n", __FUNCTION__, __LINE__);
|
lt_info( "%s - %d failed\n", __FUNCTION__, __LINE__);
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
position = pts / 1000000.0;
|
position = pts / 1000000.0;
|
||||||
|
Reference in New Issue
Block a user