eeva
/
jamulus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix warning

This commit is contained in:
Volker Fischer 2010-04-11 07:55:06 +00:00
parent c638ccf272
commit 0febeb73ac
3 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/sound.cpp
View File

@ -241,7 +241,7 @@ int CSound::process ( jack_nframes_t nframes, void* arg )
return 0; // zero on success, non-zero on error
}
int CSound::bufferSizeCallback ( jack_nframes_t nframes, void *arg )
int CSound::bufferSizeCallback ( jack_nframes_t, void *arg )
{
CSound* pSound = reinterpret_cast<CSound*> ( arg );
@ -250,7 +250,7 @@ int CSound::bufferSizeCallback ( jack_nframes_t nframes, void *arg )
return 0; // zero on success, non-zero on error
}
void CSound::shutdownCallback ( void *arg )
void CSound::shutdownCallback ( void* )
{
// without a Jack server, our software makes no sense to run, throw
// error message

4
linux/sound.h
View File

@ -83,8 +83,8 @@ protected:
// callbacks
static int process ( jack_nframes_t nframes, void* arg );
static int bufferSizeCallback ( jack_nframes_t nframes, void *arg );
static void shutdownCallback ( void *arg );
static int bufferSizeCallback ( jack_nframes_t, void *arg );
static void shutdownCallback ( void* );
jack_client_t* pJackClient;
};
#else

111
llcon.pro
View File

@ -67,7 +67,6 @@ HEADERS += src/buffer.h \
src/chatdlg.h \
src/llconclientdlg.h \
src/clientsettingsdlg.h \
libs/celt/ecintrin.h \
libs/celt/celt.h \
libs/celt/celt_types.h \
libs/celt/celt_header.h \
@ -139,58 +138,58 @@ SOURCES += src/buffer.cpp \
libs/celt/rate.c \
libs/celt/vq.c
DISTFILES += AUTHORS \
COPYING \
NEWS \
TODO \
README \
INSTALL \
ChangeLog \
libs\celt\AUTHORS \
libs\celt\ChangeLog \
libs\celt\COPYING \
libs\celt\INSTALL \
libs\celt\NEWS \
libs\celt\README \
libs\celt\README_LLCON \
libs\celt\TODO \
src/res/faderbackground.png \
src/res/faderhandle.png \
src/res/faderhandlesmall.png \
src/res/ledbuttonnotpressed.png \
src/res/ledbuttonpressed.png \
src/res/mixerboardbackground.png \
src/res/gig.png \
src/res/mainicon.png \
src/res/CLEDBlack.png \
src/res/CLEDGrey.png \
src/res/CLEDGreen.png \
src/res/CLEDYellow.png \
src/res/CLEDRed.png \
src/res/CLEDDisabledSmall.png \
src/res/CLEDBlackSmall.png \
src/res/CLEDGreySmall.png \
src/res/CLEDGreenSmall.png \
src/res/CLEDYellowSmall.png \
src/res/CLEDRedSmall.png \
src/res/VLEDBlack.png \
src/res/VLEDGrey.png \
src/res/VLEDGreen.png \
src/res/VLEDYellow.png \
src/res/VLEDRed.png \
src/res/VLEDDisabledSmall.png \
src/res/VLEDBlackSmall.png \
src/res/VLEDGreySmall.png \
src/res/VLEDGreenSmall.png \
src/res/VLEDYellowSmall.png \
src/res/VLEDRedSmall.png \
src/res/VRLEDBlack.png \
src/res/VRLEDGrey.png \
src/res/VRLEDGreen.png \
src/res/VRLEDYellow.png \
src/res/VRLEDRed.png \
src/res/VRLEDBlackSmall.png \
src/res/VRLEDGreySmall.png \
src/res/VRLEDGreenSmall.png \
src/res/VRLEDYellowSmall.png \
src/res/VRLEDRedSmall.png
DISTFILES += AUTHORS \
COPYING \
NEWS \
TODO \
README \
INSTALL \
ChangeLog \
libs\celt\AUTHORS \
libs\celt\ChangeLog \
libs\celt\COPYING \
libs\celt\INSTALL \
libs\celt\NEWS \
libs\celt\README \
libs\celt\README_LLCON \
libs\celt\TODO \
src/res/faderbackground.png \
src/res/faderhandle.png \
src/res/faderhandlesmall.png \
src/res/ledbuttonnotpressed.png \
src/res/ledbuttonpressed.png \
src/res/mixerboardbackground.png \
src/res/gig.png \
src/res/mainicon.png \
src/res/CLEDBlack.png \
src/res/CLEDGrey.png \
src/res/CLEDGreen.png \
src/res/CLEDYellow.png \
src/res/CLEDRed.png \
src/res/CLEDDisabledSmall.png \
src/res/CLEDBlackSmall.png \
src/res/CLEDGreySmall.png \
src/res/CLEDGreenSmall.png \
src/res/CLEDYellowSmall.png \
src/res/CLEDRedSmall.png \
src/res/VLEDBlack.png \
src/res/VLEDGrey.png \
src/res/VLEDGreen.png \
src/res/VLEDYellow.png \
src/res/VLEDRed.png \
src/res/VLEDDisabledSmall.png \
src/res/VLEDBlackSmall.png \
src/res/VLEDGreySmall.png \
src/res/VLEDGreenSmall.png \
src/res/VLEDYellowSmall.png \
src/res/VLEDRedSmall.png \
src/res/VRLEDBlack.png \
src/res/VRLEDGrey.png \
src/res/VRLEDGreen.png \
src/res/VRLEDYellow.png \
src/res/VRLEDRed.png \
src/res/VRLEDBlackSmall.png \
src/res/VRLEDGreySmall.png \
src/res/VRLEDGreenSmall.png \
src/res/VRLEDYellowSmall.png \
src/res/VRLEDRedSmall.png