X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bindings%2Fpython%2Fvlc_position.c;h=e2e736be7f811e0e15a5dad18edc6b29f5ec586c;hb=b5277240aa78e2515cc4f32ca4b582160b2ee8d8;hp=1a42be7bbdf99c3f88ac5db9188819182c3fc0a4;hpb=c9958ed21646465252d2d196e24beac4d1e91d02;p=vlc

diff --git a/bindings/python/vlc_position.c b/bindings/python/vlc_position.c
index 1a42be7bbd..e2e736be7f 100644
--- a/bindings/python/vlc_position.c
+++ b/bindings/python/vlc_position.c
@@ -26,13 +26,44 @@
  * Position
  ***********************************************************************/
 
-static int
-PyPosition_init( PyPosition *self, PyObject *args, PyObject *kwds )
+static PyObject *
+PyPosition_new( PyTypeObject *type, PyObject *args, PyObject *kwds )
 {
-    self->origin = mediacontrol_AbsolutePosition;
-    self->key    = mediacontrol_MediaTime;
-    self->value  = 0;
-    return 0;
+    PyPosition *self;
+    static char *kwlist[] = { "value", "origin", "key", NULL};
+
+    self = PyObject_New( PyPosition, &PyPosition_Type );
+
+    self->value=0;
+    self->origin=mediacontrol_AbsolutePosition;
+    self->key=mediacontrol_MediaTime;
+
+    if(! PyArg_ParseTupleAndKeywords( args, kwds, "|lii", kwlist,
+                                      &(self->value),
+                                      &(self->origin),
+                                      &(self->key) ) )
+    {
+        return NULL;
+    }
+
+    if( self->key != mediacontrol_MediaTime
+    && self->key != mediacontrol_ByteCount
+    && self->key != mediacontrol_SampleCount )
+    {
+        PyErr_SetString ( MediaControl_InternalException, "Invalid key value" );
+        return NULL;
+    }
+
+    if( self->origin != mediacontrol_AbsolutePosition
+    && self->origin != mediacontrol_RelativePosition
+    && self->origin != mediacontrol_ModuloPosition )
+    {
+        PyErr_SetString ( MediaControl_InternalException, "Invalid origin value" );
+        return NULL;
+    }
+
+    Py_INCREF( self );
+    return ( PyObject * )self;
 }
 
 mediacontrol_PositionKey
@@ -167,7 +198,7 @@ static PyTypeObject PyPosition_Type =
     0,                         /*tp_setattro*/
     0,                         /*tp_as_buffer*/
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
-    "Represent a Position with origin, key and value",  /* tp_doc */
+    "Represent a Position with value, origin and key",  /* tp_doc */
     0,                        /* tp_traverse */
     0,                        /* tp_clear */
     0,                         /* tp_richcompare */
@@ -182,7 +213,7 @@ static PyTypeObject PyPosition_Type =
     0,                         /* tp_descr_get */
     0,                         /* tp_descr_set */
     0,                         /* tp_dictoffset */
-    ( initproc )PyPosition_init, /* tp_init */
+    0,                         /* tp_init */
     0,                         /* tp_alloc */
-    0,                         /* tp_new */
+    PyPosition_new,            /* tp_new */
 };