[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-player-dev
Subject: Re: [Player-dev] CR: rename all playerobject method names to camel
From: Greg Wright <gwright () real ! com>
Date: 2007-04-20 22:05:03
Message-ID: 4629390F.7080501 () real ! com
[Download RAW message or body]
Looks good for HEAD.
--greg.
Brandon Philips wrote:
> Modified by: Brandon Philips <brandon@osuosl.org >
> Date: <04:20:07>
> Project: Player, pykit
> Bug Number: 6157
> Bug URL: https://bugs.helixcommunity.org/show_bug.cgi?id=6157
>
> Synopsis: rename all playerobject method names to camel case
>
> Files Modified:
> examples/player.py | 72 ++++++++--------
> playerobject.cpp | 236 ++++++++++++++++++++++++++---------------------------
> 2 files changed, 154 insertions(+), 154 deletions(-)
>
> Platforms and Profiles Functionality verified:
> x86, helix-client-OLPC
>
> Branch: HEAD
>
> Copyright assignment:
>
> In consideration for RealNetworks' hosting and maintenance of my modification,
> I agree to assign to RealNetworks full copyright ownership of the code included
> in the attached patch, and agree that RealNetworks has no duty of accounting to
> me for it. I warrant that this code is entirely original to and owned by me,
> that I can legally grant the copyright assignment, and that my contribution
> does not violate any other person's rights, and laws or breach any contract. I
> understand that RealNetworks may license this code under RPSL, RCSL, and/or any
> other license at RealNetworks' discretion, and use the code in any way.
>
> QA Instructions:
> Change any tests that use the old method names
>
> ---
>
> Index: python/examples/player.py
> ===================================================================
> --- python.orig/examples/player.py
> +++ python/examples/player.py
> @@ -14,7 +14,7 @@ import gtk
> import time
>
> def aspectSafeResize(window, player):
> - oldWidth,oldHeight = player.getsize()
> + oldWidth,oldHeight = player.getSize()
> width, height = window.size_request()
>
> if (width >= height):
> @@ -23,16 +23,16 @@ def aspectSafeResize(window, player):
> else:
> newHeight = height
> newWidth = (oldWidth * newHeight) / oldHeight
> - player.setsize(int(newWidth),int(newHeight))
> + player.setSize(int(newWidth),int(newHeight))
>
> def positionInCenter(window, player):
> - playerWidth, playerHeight = player.getsize()
> + playerWidth, playerHeight = player.getSize()
> windowWidth, windowHeight = window.size_request()
>
> x = (windowWidth / 2) - (playerWidth / 2)
> y = (windowHeight / 2) - (playerHeight / 2)
>
> - player.setposition(int(x), int(y))
> + player.setPosition(int(x), int(y))
>
> class Player:
>
> @@ -166,8 +166,8 @@ class Player:
> if (self.player != None):
> self.playing=1
> self.player.start()
> - if self.player.getvelocity() != 100:
> - self.player.setvelocity(100)
> + if self.player.getVelocity() != 100:
> + self.player.setVelocity(100)
> elif (self.file != None):
> self.openfile(self.file)
>
> @@ -178,15 +178,15 @@ class Player:
>
> def backward(self, widget):
> if (self.player != None):
> - self.player.setvelocity(-50)
> + self.player.setVelocity(-50)
>
> def forward(self, widget):
> if (self.player != None):
> - self.player.setvelocity(50)
> + self.player.setVelocity(50)
>
> def fullscreen(self, widget):
> if (self.player != None):
> - self.player.enterfullscreen()
> + self.player.enterFullScreen()
>
> def stop(self, widget):
> if (self.player != None):
> @@ -197,11 +197,11 @@ class Player:
> #players all the time for all clips....
> #self.player.close()
> #self.player = None
> - self.player.closevelocity()
> + self.player.closeVelocity()
> self.progressbar.set_value(0)
>
> def blank(self):
> - self.player.setsize(1, 1)
> + self.player.setSize(1, 1)
> self.subwin.hide()
> self.subwin.show()
>
> @@ -211,16 +211,16 @@ class Player:
> self.progressbar.set_increments(self.player.length()*.05,self.player.length()*.1)
>
> #setup the volume slider
> - self.volume.set_value(self.player.getvolume())
> + self.volume.set_value(self.player.getVolume())
>
> #scale to window, but only when the file is opened
> - if(self.sizeupdated==0 and self.player.hassite()):
> + if(self.sizeupdated==0 and self.player.hasSite()):
> self.sizeupdated=1
> aspectSafeResize(self.subwin, self.player)
> positionInCenter(self.subwin, self.player)
>
> #initialize the velocity controls
> - #self.player.initvelocity()
> + #self.player.initVelocity()
>
> def on_pos_length(self,player,cb,args,(pos,length)):
> #only update the progress bar when its not being dragged
> @@ -244,14 +244,14 @@ class Player:
>
> def barseek(self, widget, value, data):
> if (self.player != None):
> - self.player.quickseek(data)
> + self.player.quickSeek(data)
>
> def changevolume(self, widget, value, data):
> #workaround for widget returning more than the specified maximum value 100
> if (self.player != None):
> if (data > 100):
> data = 100
> - self.player.setvolume(data)
> + self.player.setVolume(data)
> if (self.mute.get_active()):
> self.mute.set_active(False)
>
> @@ -270,39 +270,39 @@ class Player:
> self.run=0
>
> def on_presentation_closed(self, player, data=None, data1=None, data2=None):
> - self.player.exitfullscreen()
> + self.player.exitFullScreen()
> self.playing=0
> - self.player.closevelocity()
> + self.player.closeVelocity()
>
> def changebrightness(self, widget, value, data):
> - if (self.player != None and self.player.hassite()):
> - self.player.setbrightness(data)
> + if (self.player != None and self.player.hasSite()):
> + self.player.setBrightness(data)
>
> def changecontrast(self, widget, value, data):
> - if (self.player != None and self.player.hassite()):
> - self.player.setcontrast(data)
> + if (self.player != None and self.player.hasSite()):
> + self.player.setContrast(data)
>
> def changehue(self, widget, value, data):
> - if (self.player != None and self.player.hassite()):
> - self.player.sethue(data)
> + if (self.player != None and self.player.hasSite()):
> + self.player.setHue(data)
>
> def changesaturation(self, widget, value, data):
> - if (self.player != None and self.player.hassite()):
> - self.player.setsaturation(data)
> + if (self.player != None and self.player.hasSite()):
> + self.player.setSaturation(data)
>
> def update_all_color_controls(self):
> - if (self.player != None and self.player.hassite()):
> - self.brightnessSlider.set_value(self.player.getbrightness())
> - self.contrastSlider.set_value(self.player.getcontrast())
> - self.hueSlider.set_value(self.player.gethue())
> - self.saturationSlider.set_value(self.player.getsaturation())
> + if (self.player != None and self.player.hasSite()):
> + self.brightnessSlider.set_value(self.player.getBrightness())
> + self.contrastSlider.set_value(self.player.getContrast())
> + self.hueSlider.set_value(self.player.getHue())
> + self.saturationSlider.set_value(self.player.getSaturation())
>
> def color_defaults(self, widget):
> - if (self.player != None and self.player.hassite()):
> - self.player.setbrightness(0)
> - self.player.setcontrast(0)
> - self.player.sethue(0)
> - self.player.setsaturation(0)
> + if (self.player != None and self.player.hasSite()):
> + self.player.setBrightness(0)
> + self.player.setContrast(0)
> + self.player.setHue(0)
> + self.player.setSaturation(0)
> self.update_all_color_controls();
>
> def colorcontrols(self, widget):
> Index: python/playerobject.cpp
> ===================================================================
> --- python.orig/playerobject.cpp
> +++ python/playerobject.cpp
> @@ -66,62 +66,62 @@ static const char player_callbacks_doc[]
> list -- C variable pointer to where the list is stored";
> static const char player_close_doc[] = "close the player object";
> static const char player_done_doc[] = "returns 1 if the player is done or 0 if it \
> is not";
> -static const char player_getsize_doc[] = "returns the size (dimensions) of the \
> player object as a set of integers (width, height)";
> -static const char player_getsource_doc[] = "returns a source object at the index \
> provided \ +static const char player_getSize_doc[] = "returns the size (dimensions) \
> of the player object as a set of integers (width, height)"; +static const char \
> player_getSource_doc[] = "returns a source object at the index provided \ source -- \
> integer index for the source object";
> -static const char player_getvolume_doc[] = "returns the current volume";
> -static const char player_hassite_doc[] = "returns 1 if the player has a site, or 0 \
> if it does not"; +static const char player_getVolume_doc[] = "returns the current \
> volume"; +static const char player_hasSite_doc[] = "returns 1 if the player has a \
> site, or 0 if it does not"; static const char player_length_doc[] = "returns the \
> length of the loaded clip in seconds"; static const char player_mute_doc[] = \
> "toggles mute on the player"; static const char player_open_doc[] = "";
> static const char player_pause_doc[] = "pases the loaded clip";
> -static const char player_enterfullscreen_doc[] = "enter fullscreen mode";
> -static const char player_exitfullscreen_doc[] = "exit fullscreen mode";
> +static const char player_enterFullScreen_doc[] = "enter fullscreen mode";
> +static const char player_exitFullScreen_doc[] = "exit fullscreen mode";
> static const char player_pump_doc[] = "checks to see if there are any waiting \
> events and performs the next one if it exists for the player \
> object";
> -static const char player_quickseek_doc[] = "quick seeks to the time provided. \
> +static const char player_quickSeek_doc[] = "quick seeks to the time provided. \
> time_args -- the time to seek to";
> static const char player_schedule_doc[] = "";
> static const char player_seek_doc[] = "seeks to the time provided \
> time_args -- the time to seek to";
> -static const char player_setcallback_doc[] = "set a callback function \
> +static const char player_setCallback_doc[] = "set a callback function \
> type -- callback type \
> func -- callback function \
> funcargs -- arguments to the function";
> -static const char player_setposition_doc[] = "set the position of where to start \
> drawing video \ +static const char player_setPosition_doc[] = "set the position of \
> where to start drawing video \ x -- x coordinate of upper left corner \
> y -- y coordinate of upper left corner";
> -static const char player_setsize_doc[] = "set the size of the video output \
> +static const char player_setSize_doc[] = "set the size of the video output \
> width -- width of video \
> height -- height of video";
> #if defined(HELIX_FEATURE_PLAYBACK_VELOCITY)
> -static const char player_setvelocity_doc[] = "sets the playback velocity to the \
> value specified \ +static const char player_setVelocity_doc[] = "sets the playback \
> velocity to the value specified \ velocity -- velocity of playback";
> -static const char player_getvelocity_doc[] = "gets the playback velocity";
> -static const char player_initvelocity_doc[] = "initializes the playback velocity \
> interface";
> -static const char player_closevelocity_doc[] = "closes the playback velocity \
> controls"; +static const char player_getVelocity_doc[] = "gets the playback \
> velocity"; +static const char player_initVelocity_doc[] = "initializes the playback \
> velocity interface"; +static const char player_closeVelocity_doc[] = "closes the \
> playback velocity controls"; #endif
> -static const char player_setvolume_doc[] = "sets the volume to the value \
> specified";
> -static const char player_sourcecount_doc[] = "return the number of source \
> indexes"; +static const char player_setVolume_doc[] = "sets the volume to the value \
> specified"; +static const char player_sourceCount_doc[] = "return the number of \
> source indexes"; static const char player_sources_doc[] = "returns the source \
> objects"; static const char player_start_doc[] = "starts playback";
> static const char player_stats_doc[] = "";
> static const char player_stop_doc[] = "stops playback";
> static const char player_time_doc[] = "";
> -static const char player_addaudiohook_doc[] = "";
> -static const char player_removeaudiohook_doc[] = "";
> -static const char player_viewsource_doc[] = "";
> -static const char player_setbrightness_doc[] = "sets the video brightness\
> +static const char player_addAudioHook_doc[] = "";
> +static const char player_removeAudioHook_doc[] = "";
> +static const char player_viewSource_doc[] = "";
> +static const char player_setBrightness_doc[] = "sets the video brightness\
> value -- new value for brightness. limit must be between -1 and 1 inclusive";
> -static const char player_getbrightness_doc[] = "returns the video brightness";
> -static const char player_setcontrast_doc[] = "sets the video contrast\
> +static const char player_getBrightness_doc[] = "returns the video brightness";
> +static const char player_setContrast_doc[] = "sets the video contrast\
> value -- new value for brightness. limit must be between -1 and 1 inclusive";
> -static const char player_getcontrast_doc[] = "returns the video contrast";
> -static const char player_sethue_doc[] = "sets the video hue\
> +static const char player_getContrast_doc[] = "returns the video contrast";
> +static const char player_setHue_doc[] = "sets the video hue\
> value -- new value for brightness. limit must be between -1 and 1 inclusive";
> -static const char player_gethue_doc[] = "returns the video hue";
> -static const char player_setsaturation_doc[] = "set the video saturation\
> +static const char player_getHue_doc[] = "returns the video hue";
> +static const char player_setSaturation_doc[] = "set the video saturation\
> value -- new value for brightness. limit must be between -1 and 1 inclusive";
> -static const char player_getsaturation_doc[] = "returns the video saturation";
> +static const char player_getSaturation_doc[] = "returns the video saturation";
> static const char err_closed[] = "illegal operation on a closed player.";
>
> static SimpleList playerlist;
> @@ -294,7 +294,7 @@ player_authenticate
> }
>
> static PyObject*
> -player_setbrightness
> +player_setBrightness
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -313,7 +313,7 @@ player_setbrightness
> }
>
> static PyObject*
> -player_getbrightness
> +player_getBrightness
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -328,7 +328,7 @@ player_getbrightness
> }
>
> static PyObject*
> -player_setcontrast
> +player_setContrast
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -347,7 +347,7 @@ player_setcontrast
> }
>
> static PyObject*
> -player_getcontrast
> +player_getContrast
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -363,7 +363,7 @@ player_getcontrast
> }
>
> static PyObject*
> -player_sethue
> +player_setHue
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -382,7 +382,7 @@ player_sethue
> }
>
> static PyObject*
> -player_gethue
> +player_getHue
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -398,7 +398,7 @@ player_gethue
> }
>
> static PyObject*
> -player_setsaturation
> +player_setSaturation
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -417,7 +417,7 @@ player_setsaturation
> }
>
> static PyObject*
> -player_getsaturation
> +player_getSaturation
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -502,7 +502,7 @@ player_done
> }
>
> static PyObject*
> -player_getsize
> +player_getSize
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -514,7 +514,7 @@ player_getsize
>
> if (!PyArg_ParseTuple(args, ""))
> {
> - PyErr_SetString(PyExc_ValueError, "getsize expects no arguments");
> + PyErr_SetString(PyExc_ValueError, "getSize expects no arguments");
> return NULL;
> }
>
> @@ -525,7 +525,7 @@ player_getsize
> }
>
> static PyObject*
> -player_getvolume
> +player_getVolume
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -533,7 +533,7 @@ player_getvolume
> {
> if (!PyArg_ParseTuple(args, ""))
> {
> - PyErr_SetString(PyExc_ValueError, "getvolume expects no arguments");
> + PyErr_SetString(PyExc_ValueError, "getVolume expects no arguments");
> return NULL;
> }
>
> @@ -541,7 +541,7 @@ player_getvolume
> }
>
> static PyObject*
> -player_hassite
> +player_hasSite
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -549,7 +549,7 @@ player_hassite
> {
> if (!PyArg_ParseTuple(args, ""))
> {
> - PyErr_SetString(PyExc_ValueError, "hassite expects no arguments");
> + PyErr_SetString(PyExc_ValueError, "hasSite expects no arguments");
> return NULL;
> }
>
> @@ -557,7 +557,7 @@ player_hassite
> }
>
> static PyObject*
> -player_getsource
> +player_getSource
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -684,7 +684,7 @@ player_pause
> }
>
> static PyObject*
> -player_enterfullscreen
> +player_enterFullScreen
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -709,7 +709,7 @@ player_enterfullscreen
> }
>
> static PyObject*
> -player_exitfullscreen
> +player_exitFullScreen
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -746,7 +746,7 @@ player_pump
> }
>
> static PyObject*
> -player_quickseek
> +player_quickSeek
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -837,7 +837,7 @@ player_seek
> }
>
> static PyObject*
> -player_setcallback
> +player_setCallback
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -869,7 +869,7 @@ player_setcallback
> }
>
> static PyObject*
> -player_setsize
> +player_setSize
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -893,7 +893,7 @@ player_setsize
> }
>
> static PyObject*
> -player_setposition
> +player_setPosition
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -916,7 +916,7 @@ player_setposition
> }
>
> static PyObject*
> -player_setvolume
> +player_setVolume
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -941,7 +941,7 @@ player_setvolume
>
> #if defined(HELIX_FEATURE_PLAYBACK_VELOCITY)
> static PyObject*
> -player_setvelocity
> +player_setVelocity
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -959,7 +959,7 @@ player_setvelocity
> }
>
> static PyObject*
> -player_closevelocity
> +player_closeVelocity
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -969,7 +969,7 @@ player_closevelocity
> }
>
> static PyObject*
> -player_getvelocity
> +player_getVelocity
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -979,7 +979,7 @@ player_getvelocity
> }
>
> static PyObject*
> -player_initvelocity
> +player_initVelocity
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -990,7 +990,7 @@ player_initvelocity
> #endif
>
> static PyObject*
> -player_sourcecount
> +player_sourceCount
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -1140,7 +1140,7 @@ player_time
> }
>
> static PyObject*
> -player_addaudiohook
> +player_addAudioHook
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -1169,7 +1169,7 @@ player_addaudiohook
> }
>
> static PyObject*
> -player_removeaudiohook
> +player_removeAudioHook
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -1190,7 +1190,7 @@ player_removeaudiohook
> }
>
> static PyObject*
> -player_viewsource
> +player_viewSource
> (
> PyHxPlayerObject *p,
> PyObject *args
> @@ -1212,36 +1212,36 @@ static PyMethodDef player_methods[] =
> {
> {"authenticate", (PyCFunction)player_authenticate, METH_VARARGS,
> (char *)player_authenticate_doc},
> - {"setbrightness", (PyCFunction)player_setbrightness, METH_VARARGS,
> - (char *)player_setbrightness_doc},
> - {"getbrightness", (PyCFunction)player_getbrightness, METH_VARARGS,
> - (char *)player_getbrightness_doc},
> - {"setcontrast", (PyCFunction)player_setcontrast, METH_VARARGS,
> - (char *)player_setcontrast_doc},
> - {"getcontrast", (PyCFunction)player_getcontrast, METH_VARARGS,
> - (char *)player_getcontrast_doc},
> - {"sethue", (PyCFunction)player_sethue, METH_VARARGS,
> - (char *)player_sethue_doc},
> - {"gethue", (PyCFunction)player_gethue, METH_VARARGS,
> - (char *)player_gethue_doc},
> - {"setsaturation", (PyCFunction)player_setsaturation, METH_VARARGS,
> - (char *)player_setsaturation_doc},
> - {"getsaturation", (PyCFunction)player_getsaturation, METH_VARARGS,
> - (char *)player_getsaturation_doc},
> + {"setBrightness", (PyCFunction)player_setBrightness, METH_VARARGS,
> + (char *)player_setBrightness_doc},
> + {"getBrightness", (PyCFunction)player_getBrightness, METH_VARARGS,
> + (char *)player_getBrightness_doc},
> + {"setContrast", (PyCFunction)player_setContrast, METH_VARARGS,
> + (char *)player_setContrast_doc},
> + {"getContrast", (PyCFunction)player_getContrast, METH_VARARGS,
> + (char *)player_getContrast_doc},
> + {"setHue", (PyCFunction)player_setHue, METH_VARARGS,
> + (char *)player_setHue_doc},
> + {"getHue", (PyCFunction)player_getHue, METH_VARARGS,
> + (char *)player_getHue_doc},
> + {"setSaturation", (PyCFunction)player_setSaturation, METH_VARARGS,
> + (char *)player_setSaturation_doc},
> + {"getSaturation", (PyCFunction)player_getSaturation, METH_VARARGS,
> + (char *)player_getSaturation_doc},
> {"callbacks", (PyCFunction)player_callbacks, METH_VARARGS,
> (char *)player_callbacks_doc},
> {"close", (PyCFunction)player_close, METH_VARARGS,
> (char *)player_close_doc},
> {"done", (PyCFunction)player_done, METH_VARARGS,
> (char *)player_done_doc},
> - {"getsize", (PyCFunction)player_getsize, METH_VARARGS,
> - (char *)player_getsize_doc},
> - {"getsource", (PyCFunction)player_getsource, METH_VARARGS,
> - (char *)player_getsource_doc},
> - {"getvolume", (PyCFunction)player_getvolume, METH_VARARGS,
> - (char *)player_getvolume_doc},
> - {"hassite", (PyCFunction)player_hassite, METH_VARARGS,
> - (char *)player_hassite_doc},
> + {"getSize", (PyCFunction)player_getSize, METH_VARARGS,
> + (char *)player_getSize_doc},
> + {"getSource", (PyCFunction)player_getSource, METH_VARARGS,
> + (char *)player_getSource_doc},
> + {"getVolume", (PyCFunction)player_getVolume, METH_VARARGS,
> + (char *)player_getVolume_doc},
> + {"hasSite", (PyCFunction)player_hasSite, METH_VARARGS,
> + (char *)player_hasSite_doc},
> {"length", (PyCFunction)player_length, METH_VARARGS,
> (char *)player_length_doc},
> {"mute", (PyCFunction)player_mute, METH_VARARGS,
> @@ -1250,38 +1250,38 @@ static PyMethodDef player_methods[] =
> (char *)player_open_doc},
> {"pause", (PyCFunction)player_pause, METH_VARARGS,
> (char *)player_pause_doc},
> - {"enterfullscreen", (PyCFunction)player_enterfullscreen, METH_VARARGS,
> - (char *)player_enterfullscreen_doc},
> - {"exitfullscreen", (PyCFunction)player_exitfullscreen, METH_VARARGS,
> - (char *)player_exitfullscreen_doc},
> + {"enterFullScreen", (PyCFunction)player_enterFullScreen, METH_VARARGS,
> + (char *)player_enterFullScreen_doc},
> + {"exitFullScreen", (PyCFunction)player_exitFullScreen, METH_VARARGS,
> + (char *)player_exitFullScreen_doc},
> {"pump", (PyCFunction)player_pump, METH_VARARGS,
> (char *)player_pump_doc},
> - {"quickseek", (PyCFunction)player_quickseek, METH_VARARGS,
> + {"quickSeek", (PyCFunction)player_quickSeek, METH_VARARGS,
> (char *)player_seek_doc},
> {"schedule", (PyCFunction)player_schedule, METH_VARARGS,
> (char *)player_schedule_doc},
> {"seek", (PyCFunction)player_seek, METH_VARARGS,
> (char *)player_seek_doc},
> - {"setcallback", (PyCFunction)player_setcallback, METH_VARARGS,
> - (char *)player_setcallback_doc},
> - {"setposition", (PyCFunction)player_setposition, METH_VARARGS,
> - (char *)player_setposition_doc},
> - {"setsize", (PyCFunction)player_setsize, METH_VARARGS,
> - (char *)player_setsize_doc},
> + {"setCallback", (PyCFunction)player_setCallback, METH_VARARGS,
> + (char *)player_setCallback_doc},
> + {"setPosition", (PyCFunction)player_setPosition, METH_VARARGS,
> + (char *)player_setPosition_doc},
> + {"setSize", (PyCFunction)player_setSize, METH_VARARGS,
> + (char *)player_setSize_doc},
> #if defined(HELIX_FEATURE_PLAYBACK_VELOCITY)
> - {"setvelocity", (PyCFunction)player_setvelocity, METH_VARARGS,
> - (char *)player_setvelocity_doc},
> - {"getvelocity", (PyCFunction)player_getvelocity, METH_VARARGS,
> - (char *)player_getvelocity_doc},
> - {"initvelocity", (PyCFunction)player_initvelocity, METH_VARARGS,
> - (char *)player_initvelocity_doc},
> - {"closevelocity", (PyCFunction)player_closevelocity, METH_VARARGS,
> - (char *)player_closevelocity_doc},
> + {"setVelocity", (PyCFunction)player_setVelocity, METH_VARARGS,
> + (char *)player_setVelocity_doc},
> + {"getVelocity", (PyCFunction)player_getVelocity, METH_VARARGS,
> + (char *)player_getVelocity_doc},
> + {"initVelocity", (PyCFunction)player_initVelocity, METH_VARARGS,
> + (char *)player_initVelocity_doc},
> + {"closeVelocity", (PyCFunction)player_closeVelocity, METH_VARARGS,
> + (char *)player_closeVelocity_doc},
> #endif
> - {"setvolume", (PyCFunction)player_setvolume, METH_VARARGS,
> - (char *)player_setvolume_doc},
> - {"sourcecount", (PyCFunction)player_sourcecount, METH_VARARGS,
> - (char *)player_sourcecount_doc},
> + {"setVolume", (PyCFunction)player_setVolume, METH_VARARGS,
> + (char *)player_setVolume_doc},
> + {"sourceCount", (PyCFunction)player_sourceCount, METH_VARARGS,
> + (char *)player_sourceCount_doc},
> {"sources", (PyCFunction)player_sources, METH_VARARGS,
> (char *)player_sources_doc},
> {"start", (PyCFunction)player_start, METH_VARARGS,
> @@ -1292,12 +1292,12 @@ static PyMethodDef player_methods[] =
> (char *)player_stop_doc},
> {"time", (PyCFunction)player_time, METH_VARARGS,
> (char *)player_time_doc},
> - {"addaudiohook", (PyCFunction)player_addaudiohook, METH_VARARGS,
> - (char *)player_addaudiohook_doc},
> - {"removeaudiohook", (PyCFunction)player_removeaudiohook, METH_VARARGS,
> - (char *)player_removeaudiohook_doc},
> - {"viewsource", (PyCFunction)player_viewsource, METH_VARARGS,
> - (char *)player_viewsource_doc},
> + {"addAudioHook", (PyCFunction)player_addAudioHook, METH_VARARGS,
> + (char *)player_addAudioHook_doc},
> + {"removeAudioHook", (PyCFunction)player_removeAudioHook, METH_VARARGS,
> + (char *)player_removeAudioHook_doc},
> + {"viewSource", (PyCFunction)player_viewSource, METH_VARARGS,
> + (char *)player_viewSource_doc},
> {NULL, 0, 0, 0} /* sentinel */
> };
>
> @@ -1309,9 +1309,9 @@ static struct memberlist player_memberli
> {"passwd", T_OBJECT, OFF(p_passwd), RO},
> {"data", T_OBJECT, OFF(p_data), 0},
> {"index", T_INT, OFF(p_index), RO},
> - /* getattr(p, 'closed') is implemented without this table */
> + /* getAttr(p, 'closed') is implemented without this table */
> {"closed", T_INT, 0, RO},
> - /* getattr(p, 'has_error_sink') is implemented without this table */
> + /* getAttr(p, 'has_error_sink') is implemented without this table */
> {"has_error_sink", T_INT, 0, RO},
> {NULL, 0, 0, 0} /* Sentinel */
> };
> @@ -1354,7 +1354,7 @@ player_dealloc
> }
>
> static PyObject *
> -player_getattr
> +player_getAttr
> (
> PyHxPlayerObject *p,
> char *name
> @@ -1379,7 +1379,7 @@ player_getattr
> }
>
> static int
> -player_setattr
> +player_setAttr
> (
> PyHxPlayerObject *p,
> char *name,
> @@ -1425,8 +1425,8 @@ PyTypeObject PyHxPlayer_Type =
> 0,
> (destructor)player_dealloc, /*tp_dealloc*/
> 0, /*tp_print*/
> - (getattrfunc)player_getattr, /*tp_getattr*/
> - (setattrfunc)player_setattr, /*tp_setattr*/
> + (getattrfunc)player_getAttr, /*tp_getAttr*/
> + (setattrfunc)player_setAttr, /*tp_setAttr*/
> 0, /*tp_compare*/
> (reprfunc)player_repr, /*tp_repr*/
> 0, /*tp_as_number*/
> @@ -1435,8 +1435,8 @@ PyTypeObject PyHxPlayer_Type =
> 0, /*tp_hash*/
> 0, /*tp_call*/
> 0, /*tp_str*/
> - 0, /*tp_getattro*/
> - 0, /*tp_setattro*/
> + 0, /*tp_getAttro*/
> + 0, /*tp_setAttro*/
> 0, /*tp_as_buffer*/
> 0, /*tp_flags*/
> (char*)player_doc, /*tp_doc*/
>
> _______________________________________________
> Player-dev mailing list
> Player-dev@helixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/player-dev
_______________________________________________
Player-dev mailing list
Player-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/player-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic