diff --git a/README.md b/README.md index e3e74f0..999b82e 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ DSD-FME is an evolution of the original DSD project from 'DSD Author' using the This project wouldn't be possible without a few good people providing me plenty of sample audio files to run over and over again. Special thanks to jurek1111, KrisMar, noamlivne, racingfan360, iScottyBotty, LimaZulu, Forts, thewraithe2008, RayAir, Cretu, and others for the many hours of wav samples and information provided by them. Most importantly, HRH17, whose insight, information, samples, and willingness to let me remote into a computer half-way across the globe in order to test trunking features are what make DSD-FME what it has become. I'd also like to thank mrscanner2008 for providing an additional remote where additional NXDN Type-C, 'Idas' Type-D, and XPT decoding and trunking could be sorted out. Thanks to volo-zyko for cleaning up a lot of code. Thank you everybody. -![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/main/dsd-fme2.png) +![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/audio_work/dsd-fme2.png) -![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/main/dsd-fme3.png) +![DSD-FME](https://github.com/lwvmobile/dsd-fme/blob/audio_work/dsd-fme3.png) ## Information diff --git a/download-and-install-Arch.sh b/download-and-install-Arch.sh index d7d9880..930d1c2 100644 --- a/download-and-install-Arch.sh +++ b/download-and-install-Arch.sh @@ -37,7 +37,7 @@ if [ "$ANSWER" = "y" ]; then git clone https://github.com/lwvmobile/dsd-fme ### For branch audio_work - git clone --branch audio_work https://github.com/lwvmobile/dsd-fme cd dsd-fme - git checkout audio_work + #git checkout audio_work mkdir build cd build cmake .. diff --git a/download-and-install-nodeps.sh b/download-and-install-nodeps.sh index 96ddaca..e73c10f 100644 --- a/download-and-install-nodeps.sh +++ b/download-and-install-nodeps.sh @@ -8,7 +8,7 @@ Please run download-and-install.sh instead.\n\n" read -p "Press Enter to continue..." x git clone https://github.com/lwvmobile/dsd-fme cd dsd-fme -git checkout audio_work +#git checkout audio_work mkdir build cd build cmake .. diff --git a/download-and-install.sh b/download-and-install.sh index 8950051..9acb933 100644 --- a/download-and-install.sh +++ b/download-and-install.sh @@ -31,7 +31,7 @@ if [ "$ANSWER" = "y" ]; then cd $cdir git clone https://github.com/lwvmobile/dsd-fme cd dsd-fme - git checkout audio_work + #git checkout audio_work mkdir build cd build cmake .. diff --git a/dsd-fme2.png b/dsd-fme2.png index 933bed6..cc6afd6 100644 Binary files a/dsd-fme2.png and b/dsd-fme2.png differ diff --git a/dsd-fme3.png b/dsd-fme3.png index ed998e1..139abd0 100644 Binary files a/dsd-fme3.png and b/dsd-fme3.png differ diff --git a/examples/Example_Usage.md b/examples/Example_Usage.md index a9946c6..4df9dd5 100644 --- a/examples/Example_Usage.md +++ b/examples/Example_Usage.md @@ -8,13 +8,13 @@ -fa Legacy Auto (not recommended) -fi NXDN48 -fn NXDN96 --fp ProVoice +-fp EDACS/Provoice -fm dPMR, also may need to use -xd if inverted dPMR. --fr DMR Mono, also may need to use -xr if inverted DMR. -f1 P25P1 --f2 P25P2 (may need to specify wacn/sys/nac manually) +-f2 P25P2 (may need to specify wacn/sys/nac manually if traffic channel) -fx X2-TDMA -fy YSF +-fz M17 Audio ``` ## Conventional Frequency Scanner @@ -201,9 +201,13 @@ l - Hold TG in Slot 2 on TDMA Systems, or clear current hold (Testing/WIP: DMR T ``` -Sending Audio to a Icecast 2 Server via FFmpeg (Windows) -# Make sure to enable "Stereo Mix" from Volume Control Panel and then disable Windows Sounds. +## Sending Audio to a Icecast 2 Server via FFmpeg (Windows) + +Make sure to enable "Stereo Mix" from Volume Control Panel and then disable Windows Sounds. + +``` ffmpeg -f dshow -i audio="Stereo Mix (Realtek High Definition Audio)" -c:a aac -b:a 64k -content_type 'audio/aac' -vn -f adts icecast://source:password@192.168.5.251:8844/DSDFME +``` ## Sending Audio to a Icecast 2 Server via FFmpeg (Linux w/ Pulse Audio) diff --git a/examples/Install_Notes.md b/examples/Install_Notes.md index 64d6d28..6ffd769 100644 --- a/examples/Install_Notes.md +++ b/examples/Install_Notes.md @@ -86,6 +86,7 @@ MBELib is considered a requirement in this build. You must read this notice prio ``` git clone https://github.com/lwvmobile/mbelib +git checkout ambe_tones cd mbelib mkdir build cd build