[Audacity-cvs] audacity-src/src/ondemand ODDecodeFlacTask.cpp, 1.6, 1.7 ODManager.cpp, 1.33, 1.34
Update of /cvsroot/audacity/audacity-src/src/ondemand
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21723/src/ondemand
Modified Files:
ODDecodeFlacTask.cpp ODManager.cpp
Log Message:
Fixed MSVC warnings (bool compared to zero and unused variables).
Index: ODManager.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/ondemand/ODManager.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ODManager.cpp 7 Oct 2009 23:31:41 - 1.33
+++ ODManager.cpp 6 Dec 2009 00:21:08 - 1.34
@@ -322,7 +322,8 @@
paused=mPause;
mPauseLock.Unlock();
- while(!paused tasksInArray mCurrentThreads mMaxThreads)
+ // keep adding tasks if there is work to do, up to the limit.
+ while(!paused tasksInArray (mCurrentThreads mMaxThreads))
{
mCurrentThreads++;
mCurrentThreadsMutex.Unlock();
@@ -352,8 +353,10 @@
mCurrentThreadsMutex.Unlock();
//use a conditon variable to block here instead of a sleep.
+ // JKC: If there are no tasks ready to run, or we're paused then
+ // we wait for there to be tasks in the queue.
mQueueNotEmptyCondLock.Lock();
- if(tasksInArray=0 || paused)
+ if( (!tasksInArray) || paused)
mQueueNotEmptyCond-Wait();
mQueueNotEmptyCondLock.Unlock();
@@ -366,7 +369,7 @@
//redraw the current project only (ODTasks will send a redraw on
complete even if the projects are in the background)
//we don't want to redraw at a faster rate when we have more queues
because
//this means the CPU is already taxed. This if statement normalizes the
rate
- if(mNeedsDrawnumQueues numQueues)
+ if((mNeedsDrawnumQueues) numQueues)
{
mNeedsDraw=0;
wxCommandEvent event( EVT_ODTASK_UPDATE );
Index: ODDecodeFlacTask.cpp
===
RCS file: /cvsroot/audacity/audacity-src/src/ondemand/ODDecodeFlacTask.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ODDecodeFlacTask.cpp11 Oct 2009 19:31:09 - 1.6
+++ ODDecodeFlacTask.cpp6 Dec 2009 00:21:08 - 1.7
@@ -113,14 +113,10 @@
//the inside of the read loop.
FLAC__StreamDecoderWriteStatus ODFLACFile::write_callback(const FLAC__Frame
*frame,
- const FLAC__int32 *
const buffer[])
+ const FLAC__int32 * const buffer[])
{
-
- float testfdb;
- float testfb;
- int testi;
- int bytesToCopy = frame-header.blocksize;
+ unsigned int bytesToCopy = frame-header.blocksize;
if(bytesToCopymDecoder-mDecodeBufferLen-mDecoder-mDecodeBufferWritePosition)
bytesToCopy=mDecoder-mDecodeBufferLen-mDecoder-mDecodeBufferWritePosition;
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] lib-src/libnyquist hurd-nyquist.patch,NONE,1.1
Update of /cvsroot/audacity/lib-src/libnyquist
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26616/libnyquist
Added Files:
hurd-nyquist.patch
Log Message:
Benjamin Drung's patch allowing libnyquist to build on HURD.
--- NEW FILE: hurd-nyquist.patch ---
? .deps
? Makefile
? config.log
? config.status
? hurd.patch
Index: nyquist/cmt/midifns.c
===
RCS file: /cvsroot/audacity/lib-src/libnyquist/nyquist/cmt/midifns.c,v
retrieving revision 1.1
diff -u -r1.1 midifns.c
--- nyquist/cmt/midifns.c 29 Jan 2009 18:04:20 - 1.1
+++ nyquist/cmt/midifns.c 6 Dec 2009 01:48:20 -
@@ -22,6 +22,7 @@
*/
#include switches.h
+#include sys/resource.h
#ifdef UNIX
#include sys/param.h
@@ -376,6 +377,7 @@
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
fd_set readfds;
+struct rlimit file_limit;
FD_ZERO(readfds);
FD_SET(MI_CONNECTION(midiconn), readfds);
@@ -387,7 +389,8 @@
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = unix_timeout;
}
-select(NOFILE+1, readfds, 0, 0, waitspec);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, readfds, 0, 0, waitspec);
return;
}
#else /* !UNIX_ITC */
@@ -424,6 +427,7 @@
{
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
+struct rlimit file_limit;
if (timeout = 0) {
timeout -= gettime(); /* convert to millisecond delay */
@@ -431,7 +435,8 @@
/* remainder become microsecs: */
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = unix_timeout;
-select(NOFILE+1, 0, 0, 0, waitspec);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, 0, 0, 0, waitspec);
} else {
int c = getc(stdin);
ungetc(c, stdin);
@@ -445,6 +450,7 @@
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
int readfds = 1 IOinputfd;
+struct rlimit file_limit;
if (timeout = 0) {
timeout -= gettime(); /* convert to millisecond delay */
@@ -453,7 +459,8 @@
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = unix_timeout;
}
-select(NOFILE+1, readfds, 0, 0, waitspec);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, readfds, 0, 0, waitspec);
return;
}
#endif /* BUFFERED_SYNCHRONOUS_INPUT */
Index: nyquist/cmt/userio.c
===
RCS file: /cvsroot/audacity/lib-src/libnyquist/nyquist/cmt/userio.c,v
retrieving revision 1.1
diff -u -r1.1 userio.c
--- nyquist/cmt/userio.c29 Jan 2009 18:04:21 - 1.1
+++ nyquist/cmt/userio.c6 Dec 2009 01:48:20 -
@@ -70,6 +70,7 @@
*/
#include switches.h
+#include sys/resource.h
#include stdio.h
#include string.h
@@ -1205,6 +1206,7 @@
#endif /* !UNIX_MACH */
#endif
char c;
+struct rlimit file_limit;
if (abort_flag == ABORT_LEVEL) return ABORT_CHAR;
if (abort_flag == BREAK_LEVEL) return BREAK_CHAR;
@@ -1233,7 +1235,8 @@
FD_ZERO(readfds);
FD_SET(IOinputfd, readfds);
gflush();
-select(NOFILE+1, readfds, 0, 0, NULL);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, readfds, 0, 0, NULL);
#endif /* !UNIX_MACH */
#endif /* ifdef UNIX */
}
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] lib-src/libnyquist/nyquist/cmt midifns.c, 1.1, 1.2 userio.c, 1.1, 1.2
Update of /cvsroot/audacity/lib-src/libnyquist/nyquist/cmt
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26616/libnyquist/nyquist/cmt
Modified Files:
midifns.c userio.c
Log Message:
Benjamin Drung's patch allowing libnyquist to build on HURD.
Index: midifns.c
===
RCS file: /cvsroot/audacity/lib-src/libnyquist/nyquist/cmt/midifns.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- midifns.c 29 Jan 2009 18:04:20 - 1.1
+++ midifns.c 6 Dec 2009 01:57:25 - 1.2
@@ -22,6 +22,7 @@
*/
#include switches.h
+#include sys/resource.h
#ifdef UNIX
#include sys/param.h
@@ -376,6 +377,7 @@
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
fd_set readfds;
+struct rlimit file_limit;
FD_ZERO(readfds);
FD_SET(MI_CONNECTION(midiconn), readfds);
@@ -387,7 +389,8 @@
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = unix_timeout;
}
-select(NOFILE+1, readfds, 0, 0, waitspec);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, readfds, 0, 0, waitspec);
return;
}
#else /* !UNIX_ITC */
@@ -424,6 +427,7 @@
{
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
+struct rlimit file_limit;
if (timeout = 0) {
timeout -= gettime(); /* convert to millisecond delay */
@@ -431,7 +435,8 @@
/* remainder become microsecs: */
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = unix_timeout;
-select(NOFILE+1, 0, 0, 0, waitspec);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, 0, 0, 0, waitspec);
} else {
int c = getc(stdin);
ungetc(c, stdin);
@@ -445,6 +450,7 @@
struct timeval unix_timeout;
struct timeval *waitspec = NULL;
int readfds = 1 IOinputfd;
+struct rlimit file_limit;
if (timeout = 0) {
timeout -= gettime(); /* convert to millisecond delay */
@@ -453,7 +459,8 @@
unix_timeout.tv_usec = (timeout - (unix_timeout.tv_sec * 1000)) * 1000;
waitspec = unix_timeout;
}
-select(NOFILE+1, readfds, 0, 0, waitspec);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, readfds, 0, 0, waitspec);
return;
}
#endif /* BUFFERED_SYNCHRONOUS_INPUT */
Index: userio.c
===
RCS file: /cvsroot/audacity/lib-src/libnyquist/nyquist/cmt/userio.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- userio.c29 Jan 2009 18:04:21 - 1.1
+++ userio.c6 Dec 2009 01:57:25 - 1.2
@@ -70,6 +70,7 @@
*/
#include switches.h
+#include sys/resource.h
#include stdio.h
#include string.h
@@ -1205,6 +1206,7 @@
#endif /* !UNIX_MACH */
#endif
char c;
+struct rlimit file_limit;
if (abort_flag == ABORT_LEVEL) return ABORT_CHAR;
if (abort_flag == BREAK_LEVEL) return BREAK_CHAR;
@@ -1233,7 +1235,8 @@
FD_ZERO(readfds);
FD_SET(IOinputfd, readfds);
gflush();
-select(NOFILE+1, readfds, 0, 0, NULL);
+getrlimit(RLIMIT_NOFILE, file_limit);
+select(file_limit.rlim_max+1, readfds, 0, 0, NULL);
#endif /* !UNIX_MACH */
#endif /* ifdef UNIX */
}
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] lib-src audacity-patches.txt,1.46,1.47
Update of /cvsroot/audacity/lib-src In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26616 Modified Files: audacity-patches.txt Log Message: Benjamin Drung's patch allowing libnyquist to build on HURD. Index: audacity-patches.txt === RCS file: /cvsroot/audacity/lib-src/audacity-patches.txt,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- audacity-patches.txt22 Aug 2009 20:16:37 - 1.46 +++ audacity-patches.txt6 Dec 2009 01:57:25 - 1.47 @@ -74,6 +74,8 @@ Digital Audio scripting language, with our own library interface added to it kFreeBSD-nyquist.patch Patch from Benjamin Drung to build nyquist on kFreeBSD. Asked him to send it upstream 2009/08/22 +hurd-nyquist.patch Patch from Benjamin Drung to build nyquist on HURD. +Asked him to send it upstream 2009/12/05. libogg -- -- Join us December 9, 2009 for the Red Hat Virtual Experience, a free event focused on virtualization and cloud computing. Attend in-depth sessions from your desk. Your couch. Anywhere. http://p.sf.net/sfu/redhat-sfdev2dev ___ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs
[Audacity-cvs] audacity-src/win audacity_unicode.iss,1.29,1.30
Update of /cvsroot/audacity/audacity-src/win
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22245
Modified Files:
audacity_unicode.iss
Log Message:
Remove old help folder to prevent installation errors when the help folder
already
exists. Please change to some other more elegant solution if required.
Index: audacity_unicode.iss
===
RCS file: /cvsroot/audacity/audacity-src/win/audacity_unicode.iss,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- audacity_unicode.iss5 Dec 2009 01:56:44 - 1.29
+++ audacity_unicode.iss6 Dec 2009 05:15:23 - 1.30
@@ -106,6 +106,9 @@
Type: files; Name: {app}\msvcp80.dll
Type: files; Name: {app}\msvcr80.dll
+; Get rid of previous help folder.
+Type: filesandordirs; Name: {app}\help
+
; Don't want to do this because user may have stored their own.
; Type: filesandordirs; Name: {app}\vst
@@ -137,3 +140,4 @@
+
--
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
___
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
