git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Plugins/Plugin.py, InfoBarGenerics.py: add WHERE_AUDIOMENU for plugins .. requested...
[enigma2.git]
/
lib
/
service
/
servicexine.cpp
diff --git
a/lib/service/servicexine.cpp
b/lib/service/servicexine.cpp
index 47be4d422e8cab79804e28bbbe33adcaf6e166e1..44e6a6e0ec6d96364435eb2844532955768351b6 100644
(file)
--- a/
lib/service/servicexine.cpp
+++ b/
lib/service/servicexine.cpp
@@
-175,8
+175,8
@@
RESULT eServiceXine::start()
if (m_state == stError)
return -1;
if (m_state == stError)
return -1;
-
assert
(m_state == stIdle);
-
assert
(stream);
+
ASSERT
(m_state == stIdle);
+
ASSERT
(stream);
if (!xine_open(stream, m_filename.c_str()))
{
if (!xine_open(stream, m_filename.c_str()))
{
@@
-201,8
+201,8
@@
RESULT eServiceXine::stop()
if (m_state == stError)
return -1;
if (m_state == stError)
return -1;
-
assert
(m_state != stIdle);
-
assert
(stream);
+
ASSERT
(m_state != stIdle);
+
ASSERT
(stream);
if (m_state == stStopped)
return -1;
printf("Xine: %s stop\n", m_filename.c_str());
if (m_state == stStopped)
return -1;
printf("Xine: %s stop\n", m_filename.c_str());
@@
-259,7
+259,7
@@
RESULT eServiceXine::getLength(pts_t &pts)
pts = -1;
if (m_state == stError)
return 1;
pts = -1;
if (m_state == stError)
return 1;
-
assert
(stream);
+
ASSERT
(stream);
int pos_stream, pos_time, length_time;
int pos_stream, pos_time, length_time;
@@
-293,7
+293,7
@@
RESULT eServiceXine::getPlayPosition(pts_t &pts)
pts = -1;
if (m_state == stError)
return 1;
pts = -1;
if (m_state == stError)
return 1;
-
assert
(stream);
+
ASSERT
(stream);
int pos_stream, pos_time, length_time;
int pos_stream, pos_time, length_time;