lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved VideoMode;

Browse source 
Fixed thread related bug in SoundStream.


git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1095 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
remi-k 2009-05-22 12:56:25 +00:00
parent cb511644db
commit a14719f1cd
6 changed files with 57 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

52
python/src/VideoMode.cpp
View file

@ -54,25 +54,16 @@ PySfVideoMode_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
if (self != NULL)
{
self->BitsPerPixel = 32;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "II|I:VideoMode.__init__", (char **)kwlist, &self->Width, &self->Height, &self->BitsPerPixel))
if (!PyArg_ParseTupleAndKeywords(args, kwds, "II|I:VideoMode.__new__", (char **)kwlist, &self->Width, &self->Height, &self->BitsPerPixel))
return NULL;
self->obj = new sf::VideoMode(self->Width, self->Height, self->BitsPerPixel);
}
return (PyObject *)self;
}
void
PySfVideoModeUpdate(PySfVideoMode *self)
{
self->obj->Width = self->Width;
self->obj->Height = self->Height;
self->obj->BitsPerPixel = self->BitsPerPixel;
}
static PyObject *
PySfVideoMode_IsValid(PySfVideoMode* self)
{
PySfVideoModeUpdate(self);
return PyBool_FromLong(self->obj->IsValid());
}
@ -122,16 +113,37 @@ static PyMethodDef PySfVideoMode_methods[] = {
{NULL} /* Sentinel */
};
int PySfVideoMode_Compare(PyObject *o1, PyObject *o2)
PyObject *
PySfVideoMode_richcompare(PyObject *o1, PyObject *o2, int op)
{
PySfVideoModeUpdate((PySfVideoMode *)o1);
PySfVideoModeUpdate((PySfVideoMode *)o2);
if (*(((PySfVideoMode *)o1)->obj) == *(((PySfVideoMode *)o2)->obj))
return 0;
else
return 1;
if (*(((PySfVideoMode *)o1)->obj) == *(((PySfVideoMode *)o2)->obj))
{
if (op==Py_EQ)
Py_RETURN_TRUE;
if (op==Py_NE)
Py_RETURN_FALSE;
}
else
{
if (op==Py_EQ)
Py_RETURN_FALSE;
if (op==Py_NE)
Py_RETURN_TRUE;
}
PyErr_SetString(PyExc_TypeError, "VideoMode comparison : only == and != make sens.");
return NULL;
}
int
PySfVideoMode_setattro(PyObject* self, PyObject *attr_name, PyObject *v)
{
int result = PyObject_GenericSetAttr(self, attr_name, v);
PySfVideoMode *Mode = (PySfVideoMode *)self;
Mode->obj->Width = Mode->Width;
Mode->obj->Height = Mode->Height;
Mode->obj->BitsPerPixel = Mode->BitsPerPixel;
return result;
}
PyTypeObject PySfVideoModeType = {
head_init
@ -142,7 +154,7 @@ PyTypeObject PySfVideoModeType = {
0, /*tp_print*/
0, /*tp_getattr*/
0, /*tp_setattr*/
PySfVideoMode_Compare, /*tp_compare*/
0, /*tp_compare*/
0, /*tp_repr*/
0, /*tp_as_number*/
0, /*tp_as_sequence*/
@ -159,7 +171,7 @@ Default constructor : VideoMode()\n\
Construct the video mode with its attributes : VideoMode(ModeWidth, ModeHeight, ModeBpp = 32)\n ModeWidth : Width in pixels\n ModeHeight : Height in pixels\n ModeBpp : Pixel depths in bits per pixel (32 by default)", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
PySfVideoMode_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */