In the attachment a few patches which were not included in the Fedora
yet. I don't remember for which version they are and what usefulness
of them, but just in case I send them to you.
On Sun, Oct 10, 2010 at 7:29 PM, Robin Lee <robinlee.sysu@xxxxxxxxx> wrote:
> python-alsa is taken by 'cheeselee'
>
> On Sun, Oct 10, 2010 at 10:13 PM, Andy Shevchenko
> <andy.shevchenko@xxxxxxxxx> wrote:
>>
>> Hello,
>>
>> I have no more time to support the following packages in the Fedora.
>>
>> jack-audio-connection-kit -- The Jack Audio Connection Kit
>>
>> klamav -- Clam Anti-Virus on the KDE Desktop
>>
>> man-pages-uk -- Ukrainian man pages from the Linux Documentation Project
>>
>> python-alsa -- Python binding for the ALSA library
>>
>> qstat -- Real-time Game Server Status for FPS game servers
>>
>> uniconvertor -- Universal vector graphics translator
>>
>>
>> --
>> With Best Regards,
>> Andy Shevchenko
>> --
>> devel mailing list
>> devel@xxxxxxxxxxxxxxxxxxxxxxx
>> https://admin.fedoraproject.org/mailman/listinfo/devel
>
>
> --
> devel mailing list
> devel@xxxxxxxxxxxxxxxxxxxxxxx
> https://admin.fedoraproject.org/mailman/listinfo/devel
>
--
With Best Regards,
Andy Shevchenko
From e648c25f13bfc406925317ad4461ad7d96c23447 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Date: Tue, 26 Jan 2010 08:27:26 +0200
Subject: [PATCH 1/3] alsa-python: Fix API incompatibility in test/*.py
There was new API introduced, however not all files were transformed
accorgingly.
Part of the patch based on excerpt from [1]
[1] https://bugzilla.redhat.com/show_bug.cgi?id=558229
Signed-off-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
---
test/ctltest1.py | 8 ++++----
test/mixertest2.py | 18 +++++++++---------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/test/ctltest1.py b/test/ctltest1.py
index 9221bc6..b75beb9 100755
--- a/test/ctltest1.py
+++ b/test/ctltest1.py
@@ -7,16 +7,16 @@ del sys
import alsacontrol
ctl = alsacontrol.Control()
-print 'Card info:', ctl.cardInfo()
+print 'Card info:', ctl.card_info()
try:
- print 'Hwdep devices:', ctl.hwdepDevices()
+ print 'Hwdep devices:', ctl.hwdep_devices()
except IOError, msg:
print 'No hwdep devices:', msg
try:
- print 'PCM devices:', ctl.pcmDevices()
+ print 'PCM devices:', ctl.pcm_devices()
except IOError, msg:
print 'No PCM devices:', msg
try:
- print 'Rawmidi devices:', ctl.rawmidiDevices()
+ print 'Rawmidi devices:', ctl.rawmidi_devices()
except IOError, msg:
print 'No rawmidi devices:', msg
diff --git a/test/mixertest2.py b/test/mixertest2.py
index 24e5605..6c2d026 100755
--- a/test/mixertest2.py
+++ b/test/mixertest2.py
@@ -10,25 +10,25 @@ import select
def parse_event_mask(events):
if events == 0:
return 'None'
- if events == alsamixer.EventMaskRemove:
+ if events == alsamixer.event_mask_remove:
return 'Removed'
s = ''
- for i in alsamixer.EventMask.keys():
- if events & alsamixer.EventMask[i]:
+ for i in alsamixer.event_mask.keys():
+ if events & alsamixer.event_mask[i]:
s += '%s ' % i
return s[:-1]
def event_callback(element, events):
print 'CALLBACK (DEF)! [%s] %s:%i' % (parse_event_mask(events), element.name, element.index)
- print ' ', element.getVolumeTuple(), element.getSwitchTuple()
+ print ' ', element.get_volume_tuple(), element.get_switch_tuple()
class MyElementEvent:
def callback(self, element, events):
print 'CALLBACK (CLASS)! [%s] %s:%i' % (parse_event_mask(events), element.name, element.index)
- print ' ', element.getVolumeTuple(), element.getSwitchTuple()
+ print ' ', element.get_volume_tuple(), element.get_switch_tuple()
mixer = alsamixer.Mixer()
@@ -36,13 +36,13 @@ mixer.attach()
mixer.load()
element1 = alsamixer.Element(mixer, "Front")
-element1.setCallback(event_callback)
+element1.set_callback(event_callback)
element2 = alsamixer.Element(mixer, "PCM")
-element2.setCallback(MyElementEvent())
+element2.set_callback(MyElementEvent())
poller = select.poll()
-mixer.registerPoll(poller)
+mixer.register_poll(poller)
while True:
poller.poll()
print 'Poll OK!'
- mixer.handleEvents()
+ mixer.handle_events()
--
1.6.6
From d41fc3a146150a26e2c897c1dfa5174ab3e39a0d Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Date: Mon, 25 Jan 2010 22:09:48 +0200
Subject: [PATCH 2/3] alsa-python: Clean up commented pieces of code in alsacontrol.c
Signed-off-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
---
pyalsa/alsacontrol.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/pyalsa/alsacontrol.c b/pyalsa/alsacontrol.c
index 8d401bb..9bd5381 100644
--- a/pyalsa/alsacontrol.c
+++ b/pyalsa/alsacontrol.c
@@ -39,9 +39,6 @@
#endif
static PyObject *module;
-#if 0
-static PyObject *buildin;
-#endif
/*
*
@@ -234,14 +231,6 @@ initalsacontrol(void)
if (module == NULL)
return;
-#if 0
- buildin = PyImport_AddModule("__buildin__");
- if (buildin == NULL)
- return;
- if (PyObject_SetAttrString(module, "__buildins__", buildin) < 0)
- return;
-#endif
-
Py_INCREF(&pyalsacontrol_type);
PyModule_AddObject(module, "Control", (PyObject *)&pyalsacontrol_type);
--
1.6.6
From a2965cd6e98c039a29d0958d418180c039c972c4 Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
Date: Tue, 26 Jan 2010 08:38:28 +0200
Subject: [PATCH 3/3] alsa-python: Remove unsed methods and macros in *.c
Signed-off-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
---
pyalsa/alsacard.c | 9 ---------
pyalsa/alsacontrol.c | 31 -------------------------------
pyalsa/alsahcontrol.c | 9 ---------
3 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/pyalsa/alsacard.c b/pyalsa/alsacard.c
index 4738334..aaabd44 100644
--- a/pyalsa/alsacard.c
+++ b/pyalsa/alsacard.c
@@ -22,9 +22,6 @@
#include "Python.h"
#include "structmember.h"
#include "frameobject.h"
-#ifndef PY_LONG_LONG
- #define PY_LONG_LONG LONG_LONG
-#endif
#include "sys/poll.h"
#include "stdlib.h"
#include "alsa/asoundlib.h"
@@ -32,12 +29,6 @@
#ifndef Py_RETURN_NONE
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
#endif
-#ifndef Py_RETURN_TRUE
-#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
-#endif
-#ifndef Py_RETURN_FALSE
-#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
-#endif
static PyObject *module;
diff --git a/pyalsa/alsacontrol.c b/pyalsa/alsacontrol.c
index 9bd5381..3b44cd6 100644
--- a/pyalsa/alsacontrol.c
+++ b/pyalsa/alsacontrol.c
@@ -22,47 +22,16 @@
#include "Python.h"
#include "structmember.h"
#include "frameobject.h"
-#ifndef PY_LONG_LONG
- #define PY_LONG_LONG LONG_LONG
-#endif
#include "stdlib.h"
#include "alsa/asoundlib.h"
-#ifndef Py_RETURN_NONE
-#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
-#endif
-#ifndef Py_RETURN_TRUE
-#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
-#endif
-#ifndef Py_RETURN_FALSE
-#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
-#endif
-
static PyObject *module;
-/*
- *
- */
-
-#define PYCTL(v) (((v) == Py_None) ? NULL : \
- ((struct pyalsacontrol *)(v)))
-
struct pyalsacontrol {
PyObject_HEAD
snd_ctl_t *handle;
};
-static inline PyObject *get_bool(int val)
-{
- if (val) {
- Py_INCREF(Py_True);
- return Py_True;
- } else {
- Py_INCREF(Py_False);
- return Py_False;
- }
-}
-
PyDoc_STRVAR(cardinfo__doc__,
"card_info() -- Return a dictionary with card specific information.");
diff --git a/pyalsa/alsahcontrol.c b/pyalsa/alsahcontrol.c
index dca5dac..aff1387 100644
--- a/pyalsa/alsahcontrol.c
+++ b/pyalsa/alsahcontrol.c
@@ -22,9 +22,6 @@
#include "Python.h"
#include "structmember.h"
#include "frameobject.h"
-#ifndef PY_LONG_LONG
- #define PY_LONG_LONG LONG_LONG
-#endif
#include "sys/poll.h"
#include "stdlib.h"
#include "alsa/asoundlib.h"
@@ -32,12 +29,6 @@
#ifndef Py_RETURN_NONE
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
#endif
-#ifndef Py_RETURN_TRUE
-#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True
-#endif
-#ifndef Py_RETURN_FALSE
-#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False
-#endif
static int element_callback(snd_hctl_elem_t *elem, unsigned int mask);
--
1.6.6
--
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
