mirrors/alsa-tools
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-tools.git synced 2026-02-24 01:40:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Karsten Wiese <annabellesgarden@yahoo.de>:

Browse source 
- Two Segmentation fault spots cleared.
This commit is contained in:
Takashi Iwai 2003-12-03 10:39:23 +00:00
parent ae6ba4c872
commit e6764b8a6c
5 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
us428control/Cus428State.cc
View file

@ -38,7 +38,8 @@ void us428_lights::init_us428_lights()
void Cus428State::InitDevice(void) void Cus428State::InitDevice(void)
{ {
SliderChangedTo(eFaderM, ((unsigned char*)(us428ctls_sharedmem->CtlSnapShot + us428ctls_sharedmem->CtlSnapShotLast))[eFaderM]); if (us428ctls_sharedmem->CtlSnapShotLast >= 0)
SliderChangedTo(eFaderM, ((unsigned char*)(us428ctls_sharedmem->CtlSnapShot + us428ctls_sharedmem->CtlSnapShotLast))[eFaderM]);
} }

17
us428control/Cus428_ctls.cc
View file

@ -36,26 +36,29 @@ Cus428_ctls::dump(int n)
} }
void void
Cus428_ctls::analyse(Cus428_ctls& Previous, unsigned n) Cus428_ctls::analyse(Cus428_ctls *Previous, unsigned n)
{ {
Cus428_ctls *PreviousL = Previous ? Previous : new Cus428_ctls();
OneState->Set_us428_ctls(this); OneState->Set_us428_ctls(this);
for (; n < 9; n++) { //Sliders for (; n < 9; n++) { //Sliders
char Diff = ((unsigned char*)this)[n] - ((unsigned char*)&Previous)[n]; char Diff = DiffValAt(PreviousL, n);
if (Diff) if (Diff)
OneState->SliderChangedTo(n, ((unsigned char*)this)[n]); OneState->SliderChangedTo(n, ValAt(n));
} }
for (; n < 16; n++) { //Knobs for (; n < 16; n++) { //Knobs
unsigned char Diff = ((unsigned char*)this)[n] ^ ((unsigned char*)&Previous)[n]; unsigned char Diff = DiffBitAt(PreviousL, n);
unsigned o = 0; unsigned o = 0;
while (o < 8) { while (o < 8) {
if (Diff & (1 << o)) if (Diff & (1 << o))
OneState->KnobChangedTo((Cus428State::eKnobs)(8*n + o), ((unsigned char*)this)[n] & (1 << o)); OneState->KnobChangedTo((Cus428State::eKnobs)(8*n + o), ValAt(n) & (1 << o));
++o; ++o;
} }
} }
for (; n < sizeof(*this); n++) { //wheels for (; n < sizeof(*this); n++) { //wheels
char Diff = ((unsigned char*)this)[ n] - ((unsigned char*)&Previous)[n]; char Diff = DiffValAt(PreviousL, n);
if (Diff) if (Diff)
OneState->WheelChangedTo((E_In84)n, Diff); OneState->WheelChangedTo((E_In84)n, Diff);
} }
if (0 == Previous)
delete PreviousL;
} }

15
us428control/Cus428_ctls.h
View file

@ -25,11 +25,24 @@
class Cus428_ctls: public us428_ctls{ class Cus428_ctls: public us428_ctls{
public: public:
Cus428_ctls() {
memset(this, 0, sizeof(*this));
}
void dump(int n = 0); void dump(int n = 0);
void analyse(Cus428_ctls& Previous, unsigned n = 0); void analyse(Cus428_ctls *Previous, unsigned n = 0);
bool Knob( int K) { bool Knob( int K) {
return ((char*)this)[K / 8] & (1 << K % 8); return ((char*)this)[K / 8] & (1 << K % 8);
} }
protected:
unsigned char ValAt(int i) {
return ((unsigned char*)this)[i];
}
unsigned char DiffValAt(Cus428_ctls *Other, int i) {
return ValAt(i) - Other->ValAt(i);
}
unsigned char DiffBitAt(Cus428_ctls *Other, int i) {
return ValAt(i) ^ Other->ValAt(i);
}
}; };
#endif #endif

2
us428control/configure.in
View file

@ -1,5 +1,5 @@
AC_INIT(us428control.cc) AC_INIT(us428control.cc)
AM_INIT_AUTOMAKE(us428control, 0.4) AM_INIT_AUTOMAKE(us428control, 0.4.1)
AC_PROG_CXX AC_PROG_CXX
AC_PROG_INSTALL AC_PROG_INSTALL
AC_HEADER_STDC AC_HEADER_STDC

6
us428control/us428control.cc
View file

@ -121,14 +121,16 @@ int US428Control(const char* DevName)
if (verbose > 1) if (verbose > 1)
printf("Last is %i\n", Last); printf("Last is %i\n", Last);
while (us428ctls_sharedmem->CtlSnapShotRed != Last) { while (us428ctls_sharedmem->CtlSnapShotRed != Last) {
static Cus428_ctls *Red = 0;
int Read = us428ctls_sharedmem->CtlSnapShotRed + 1; int Read = us428ctls_sharedmem->CtlSnapShotRed + 1;
if (Read >= N_us428_ctl_BUFS) if (Read >= N_us428_ctl_BUFS || Read < 0)
Read = 0; Read = 0;
Cus428_ctls* PCtlSnapShot = ((Cus428_ctls*)(us428ctls_sharedmem->CtlSnapShot)) + Read; Cus428_ctls* PCtlSnapShot = ((Cus428_ctls*)(us428ctls_sharedmem->CtlSnapShot)) + Read;
int DiffAt = us428ctls_sharedmem->CtlSnapShotDiffersAt[Read]; int DiffAt = us428ctls_sharedmem->CtlSnapShotDiffersAt[Read];
if (verbose > 1) if (verbose > 1)
PCtlSnapShot->dump(DiffAt); PCtlSnapShot->dump(DiffAt);
PCtlSnapShot->analyse(((Cus428_ctls*)(us428ctls_sharedmem->CtlSnapShot))[us428ctls_sharedmem->CtlSnapShotRed], DiffAt ); PCtlSnapShot->analyse(Red, DiffAt);
Red = PCtlSnapShot;
us428ctls_sharedmem->CtlSnapShotRed = Read; us428ctls_sharedmem->CtlSnapShotRed = Read;
} }
} }