[PC-BSD Commits] r7510 - in pcbsd/current: src-qt4/pc-sounddetect src-qt4/pc-sounddetect/xml system-overlay/usr/PCBSD/soundDetect

svn at pcbsd.org svn at pcbsd.org
Fri Sep 3 11:28:45 PDT 2010


Author: kris
Date: 2010-09-03 11:28:44 -0700 (Fri, 03 Sep 2010)
New Revision: 7510

Added:
   pcbsd/current/src-qt4/pc-sounddetect/xml/
   pcbsd/current/src-qt4/pc-sounddetect/xml/soundcards.xml
Removed:
   pcbsd/current/system-overlay/usr/PCBSD/soundDetect/soundcards.xml
Modified:
   pcbsd/current/src-qt4/pc-sounddetect/parse_sound.c
   pcbsd/current/src-qt4/pc-sounddetect/pc-sounddetect.pro
   pcbsd/current/src-qt4/pc-sounddetect/sound_detect.c
Log:

Moved the soundcards xml file to pc-sounddetect src



Modified: pcbsd/current/src-qt4/pc-sounddetect/parse_sound.c
===================================================================
--- pcbsd/current/src-qt4/pc-sounddetect/parse_sound.c	2010-09-03 18:26:26 UTC (rev 7509)
+++ pcbsd/current/src-qt4/pc-sounddetect/parse_sound.c	2010-09-03 18:28:44 UTC (rev 7510)
@@ -56,7 +56,7 @@
 	sprintf(kernelmodule,"%s","UNKNOWN");
 	
 	if (doc == NULL ) {
-		fprintf(stderr,"/PCBSD/soundDetect/soundcards.xml not found!\n");
+		fprintf(stderr,"/usr/local/share/pcbsd/pc-sounddetect/soundcards.xml not found!\n");
 		return kernelmodule;
 	}
 	

Modified: pcbsd/current/src-qt4/pc-sounddetect/pc-sounddetect.pro
===================================================================
--- pcbsd/current/src-qt4/pc-sounddetect/pc-sounddetect.pro	2010-09-03 18:26:26 UTC (rev 7509)
+++ pcbsd/current/src-qt4/pc-sounddetect/pc-sounddetect.pro	2010-09-03 18:28:44 UTC (rev 7510)
@@ -11,4 +11,7 @@
 rcd.path=/usr/local/etc/rc.d/
 rcd.files=rc.d/*
 
-INSTALLS += chmod rcd
+xml.path=/usr/local/share/pcbsd/pc-sounddetect/
+xml.files=xml/*
+
+INSTALLS += chmod rcd xml

Modified: pcbsd/current/src-qt4/pc-sounddetect/sound_detect.c
===================================================================
--- pcbsd/current/src-qt4/pc-sounddetect/sound_detect.c	2010-09-03 18:26:26 UTC (rev 7509)
+++ pcbsd/current/src-qt4/pc-sounddetect/sound_detect.c	2010-09-03 18:28:44 UTC (rev 7510)
@@ -22,7 +22,7 @@
 #include <curl/curl.h>
 
 #define	_PATH_DEVPCI	"/dev/pci"
-#define SOUNDCARD_XML  "/PCBSD/soundDetect/soundcards.xml"
+#define SOUNDCARD_XML  "/usr/local/share/pcbsd/pc-sounddetect/soundcards.xml"
 #define ALREADY_CALLED 2 
 #define FIRST_CALL  1
 



More information about the Commits mailing list