summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-09-10 14:07:21 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-09-10 14:07:21 +0000
commitf5a4d8bbe8f274b68fdd94bbe09f996d47fa2b9c (patch)
tree075d6c9dfa2dd89da2cad7966ae350ed82ca395c
parentc0706275ed16742358b6433124bdb3958309ad21 (diff)
downloadxine-lib-f5a4d8bbe8f274b68fdd94bbe09f996d47fa2b9c.tar.gz
xine-lib-f5a4d8bbe8f274b68fdd94bbe09f996d47fa2b9c.tar.bz2
- don't return failure on success
- xine-ui now calls xine_get_pos_length with NULL pointers (the cvslog missed that again) CVS patchset: 2646 CVS date: 2002/09/10 14:07:21
-rw-r--r--src/xine-engine/xine.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 2035d3d03..5ef16ffcc 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine.c,v 1.154 2002/09/09 20:43:20 uid86226 Exp $
+ * $Id: xine.c,v 1.155 2002/09/10 14:07:21 mroi Exp $
*
* top-level xine functions
*
@@ -171,7 +171,7 @@ int xine_register_report_codec_cb(xine_p this_ro,
this->report_codec_cb = report_codec;
this->report_codec_user_data = user_data;
- return 0;
+ return 1;
}
void xine_internal_osd (xine_t *this, char *str, int duration) {
@@ -915,10 +915,13 @@ static int xine_get_stream_length (xine_t *this) {
int xine_get_pos_length (xine_p this_ro, int *pos_stream,
int *pos_time, int *length_time) {
xine_t *this = (xine_t *)this_ro;
-
- *pos_stream = xine_get_current_position (this);
- *pos_time = this->cur_input_time * 1000;
- *length_time = xine_get_stream_length (this) * 1000;
+
+ if (pos_stream)
+ *pos_stream = xine_get_current_position (this);
+ if (pos_time)
+ *pos_time = this->cur_input_time * 1000;
+ if (length_time)
+ *length_time = xine_get_stream_length (this) * 1000;
return 1;
}