Commit c6610151 authored by Hirokazu Yamamoto's avatar Hirokazu Yamamoto

Merged revisions 86281,86285 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86281 | hirokazu.yamamoto | 2010-11-07 11:45:19 +0900 | 1 line

  Formatted code. (Tabify, etc)
........
  r86285 | hirokazu.yamamoto | 2010-11-07 20:07:44 +0900 | 1 line

  Reformatted code a bit.
........
parent d6b83d3a
...@@ -77,24 +77,23 @@ sound_playsound(PyObject *s, PyObject *args) ...@@ -77,24 +77,23 @@ sound_playsound(PyObject *s, PyObject *args)
int length; int length;
int ok; int ok;
if(!PyArg_ParseTuple(args,"z#i:PlaySound",&sound,&length,&flags)) { if (!PyArg_ParseTuple(args, "z#i:PlaySound", &sound, &length, &flags)) {
return NULL; return NULL;
} }
if(flags&SND_ASYNC && flags &SND_MEMORY) { if (flags & SND_ASYNC && flags & SND_MEMORY) {
/* Sidestep reference counting headache; unfortunately this also /* Sidestep reference counting headache; unfortunately this also
prevent SND_LOOP from memory. */ prevent SND_LOOP from memory. */
PyErr_SetString(PyExc_RuntimeError,"Cannot play asynchronously from memory"); PyErr_SetString(PyExc_RuntimeError, "Cannot play asynchronously from memory");
return NULL; return NULL;
} }
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
ok = PlaySound(sound,NULL,flags); ok = PlaySound(sound, NULL, flags);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if(!ok) if (!ok) {
{ PyErr_SetString(PyExc_RuntimeError, "Failed to play sound");
PyErr_SetString(PyExc_RuntimeError,"Failed to play sound"); return NULL;
return NULL;
} }
Py_INCREF(Py_None); Py_INCREF(Py_None);
...@@ -151,11 +150,10 @@ static struct PyMethodDef sound_methods[] = ...@@ -151,11 +150,10 @@ static struct PyMethodDef sound_methods[] =
static void static void
add_define(PyObject *dict, const char *key, long value) add_define(PyObject *dict, const char *key, long value)
{ {
PyObject *k=PyUnicode_FromString(key); PyObject *k = PyUnicode_FromString(key);
PyObject *v=PyLong_FromLong(value); PyObject *v = PyLong_FromLong(value);
if(v&&k) if (v && k) {
{ PyDict_SetItem(dict, k, v);
PyDict_SetItem(dict,k,v);
} }
Py_XDECREF(k); Py_XDECREF(k);
Py_XDECREF(v); Py_XDECREF(v);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment