removed some sample sounds, added another.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/sound/911ch.wav b/samples/sound/911ch.wav
deleted file mode 100644 (file)
index fdc22cc..0000000
Binary files a/samples/sound/911ch.wav and /dev/null differ

diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 5f35ab1aa5cc3e5acffce77e3733acb0f5f7ff03..16367f08161c2c7377b6fe6a6977d334e1feb08c 100644 (file)
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -158,7 +158,7 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
 
 data: 
        @mkdir -p .
-       @for f in 9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav; do \
+       @for f in 9000g.wav cuckoo.wav doggrowl.wav tinkalink.wav; do \
        if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
        cp -pRf $(srcdir)/$$f . ; \
        fi; \

diff --git a/samples/sound/chord.wav b/samples/sound/chord.wav
deleted file mode 100644 (file)
index 0193a11..0000000
Binary files a/samples/sound/chord.wav and /dev/null differ

diff --git a/samples/sound/ding.wav b/samples/sound/ding.wav
deleted file mode 100644 (file)
index 91a65a3..0000000
Binary files a/samples/sound/ding.wav and /dev/null differ

diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc
index c4e6095240b5d42a7e14a47ff14c823484e926ce..1a50ae617b8fe5efa2288b38a7b75a441d6f7040 100644 (file)
--- a/samples/sound/makefile.bcc
+++ b/samples/sound/makefile.bcc
@@ -175,7 +175,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sample.res
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**

diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index 7d07a7168b5892045b6bfb0056db09b1d360e85f..a7d513ca92460846bb65b3d482bc22ef6414a7a6 100644 (file)
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -172,7 +172,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample_rc.o
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %%f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+       for %%f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\sound_sample_rc.o: ./../../samples/sample.rc
        windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples

diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index c52968ecc43e05b20488046cfb9d86628a4407ff..b9e43303ebfd1d4ec06d59b49dee48b47e0e06c3 100644 (file)
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -259,7 +259,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**

diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat
index dfde91dcc806ec1100247fb7a339f68f8b285ae4..2ec38fc6ea1668bf86b3f3c156f45030c0e20bec 100644 (file)
--- a/samples/sound/makefile.wat
+++ b/samples/sound/makefile.wat
@@ -212,7 +212,7 @@ $(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
-       for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\sound_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
        wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<

diff --git a/samples/sound/notify.wav b/samples/sound/notify.wav
deleted file mode 100644 (file)
index 726bc0d..0000000
Binary files a/samples/sound/notify.wav and /dev/null differ

diff --git a/samples/sound/sound.bkl b/samples/sound/sound.bkl
index 4e3245ad4299ed0bdab04fcacaedb43fd05a3eb8..172927246835fc7d56e489dc8cb5c3743bbfd7ed 100644 (file)
--- a/samples/sound/sound.bkl
+++ b/samples/sound/sound.bkl
@@ -14,8 +14,7 @@
     
     <wx-data id="data">
         <files>
-           9000g.wav  911ch.wav  chord.wav  cuckoo.wav  
-           ding.wav  doggrowl.wav  notify.wav
+           9000g.wav  cuckoo.wav  doggrowl.wav  tinkalink.wav
        </files>
     </wx-data>
 

diff --git a/samples/sound/tinkalink.wav b/samples/sound/tinkalink.wav
new file mode 100644 (file)
index 0000000..5aadf88
Binary files /dev/null and b/samples/sound/tinkalink.wav differ