summaryrefslogtreecommitdiff
path: root/audio/muse/files/patch-src::jmixer.cpp
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2006-08-07 03:34:42 +0000
committerRong-En Fan <rafan@FreeBSD.org>2006-08-07 03:34:42 +0000
commit14427e99f64c5ce8be7aeee9d02aa243a992f701 (patch)
tree430543784965da71a789c5a40eb72b3fa26c2e61 /audio/muse/files/patch-src::jmixer.cpp
parent- Update to 0.2.10 (diff)
- Update to 0.9.2
- Add OPTIONS - Make some dependecies optional - Pass maintainership to submitter PR: ports/101351 Submitted by: Stanislav Sedov <ssedov at mbsd.msk.ru>
Notes
Notes: svn path=/head/; revision=169898
Diffstat (limited to 'audio/muse/files/patch-src::jmixer.cpp')
-rw-r--r--audio/muse/files/patch-src::jmixer.cpp22
1 files changed, 8 insertions, 14 deletions
diff --git a/audio/muse/files/patch-src::jmixer.cpp b/audio/muse/files/patch-src::jmixer.cpp
index 17e95ed2b42d..3a4c6ab41341 100644
--- a/audio/muse/files/patch-src::jmixer.cpp
+++ b/audio/muse/files/patch-src::jmixer.cpp
@@ -1,5 +1,5 @@
---- src/jmixer.cpp.orig Sat Apr 10 02:50:43 2004
-+++ src/jmixer.cpp Mon Apr 19 22:49:59 2004
+--- src/jmixer.cpp.orig Fri Aug 4 11:44:33 2006
++++ src/jmixer.cpp Fri Aug 4 11:46:02 2006
@@ -20,18 +20,18 @@
*/
@@ -17,7 +17,7 @@
-#include <errno.h>
+#include <cerrno>
#include <fcntl.h>
- #include <sys/soundcard.h>
+
-#include <string.h>
-#include <signal.h>
+#include <cstring>
@@ -25,18 +25,12 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <termios.h>
-@@ -624,10 +624,11 @@
- return true;
- }
-
--/* this is the function selecting files for the scandir
-- on freebsd systems you should change the following line to:
-- int selector(struct dirent *dir) { */
-+#if defined(__FreeBSD__)
+@@ -640,7 +640,7 @@
+ /* this is the function selecting files for the scandir
+ on freebsd systems you should change the following line to:
+ int selector(struct dirent *dir) { */
+-int selector(const struct dirent *dir) {
+int selector(struct dirent *dir) {
-+#else
- int selector(const struct dirent *dir) {
-+#endif
if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
#ifdef HAVE_VORBIS
|| strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0