comparing cc494173cde016f67aa818f0555e3a38d57688e3 and main on dunkirk.sh/shortwave

.github/images/ss.png

This is a binary file and will not be displayed.

.github/images/ss.webp

This is a binary file and will not be displayed.

.gitignore

···

       5
       5
        
       .clangd

     

       6
       6
        
       compile_commands.json

     

       7
       7
        
       build/

     

       8
       8
       +
       ShortwaveRadioInstaller.exe

+8 -4

CMakeLists.txt

···

       14
       14
        
       add_compile_options(-fno-threadsafe-statics)

     

       15
       15
        
       add_compile_options(-D_GLIBCXX_HAS_GTHREADS=0)

     

       16
       16
        
       

     

       17
       17
       -
       add_executable(ShortwaveApp WIN32 main.cpp)

     

       17
       17
       +
       if(MINGW)

     

       18
       18
       +
           set(WIN32_ICON shortwave.rc)

     

       19
       19
       +
       endif()

     

       20
       20
       +
       

     

       21
       21
       +
       add_executable(ShortwaveApp WIN32 main.cpp ${WIN32_ICON})

     

       18
       22
        
       

     

       19
       23
        
       # Add BASS library from libs directory

     

       20
       24
        
       target_include_directories(ShortwaveApp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

     
···

       24
       28
        
       target_include_directories(ShortwaveApp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

     

       25
       29
        
       

     

       26
       30
        
       # Minimal static linking and avoid threading dependencies

     

       27
       27
       -
       target_link_options(ShortwaveApp PRIVATE 

     

       28
       28
       -
           -static-libgcc 

     

       31
       31
       +
       target_link_options(ShortwaveApp PRIVATE

     

       32
       32
       +
           -static-libgcc

     

       29
       33
        
           -static-libstdc++

     

       30
       34
        
           -static

     

       31
       35
        
           -Wl,--subsystem,windows:5.01

     
···

       51
       55
        
               RUNTIME_OUTPUT_DIRECTORY_DEBUG "${OUTPUT_DIR}"

     

       52
       56
        
               RUNTIME_OUTPUT_DIRECTORY_RELEASE "${OUTPUT_DIR}"

     

       53
       57
        
           )

     

       54
       54
       -
       endif()
     

       58
       58
       +
       endif()

CRUSH.md

···

       8
       8
        
       ## Build & Development Commands

     

       9
       9
        
       - **Build**: `nix build`

     

       10
       10
        
         - Compiles Shortwave Radio application

     

       11
       11
       +
       - **Build Installer**: `nix build .#installer` or `build-installer`

     

       12
       12
       +
         - Creates Windows installer (ShortwaveRadioInstaller.exe)

     

       11
       13
        
       - **Dev Setup**: `setup-dev`

     

       12
       14
        
         - Generates `compile_commands.json`

     

       13
       15
        
       - **Deploy**: `deploy-to-xp`

+18 -44

README.md

···

       1
       1
        
       # Shortwave

     

       2
       2
        
       

     

       3
       3
       -
       an app for [rewind](https://rewind.hackclub.com/#)

     

       4
       4
       -
       

     

       5
       5
       -
       ![a screenshot of windows xp with a text editor open saying "this will be a very cool app soon; just you wait"](https://raw.githubusercontent.com/taciturnaxolotl/shortwave/main/.github/images/ss.webp)

     

       6
       6
       -
       

     

       7
       7
       -
       ## Install

     

       8
       8
       -
       

     

       9
       9
       -
       You can download a pre-built binary from the releases or build it yourself using the nix flake.

     

       10
       10
       -
       

     

       11
       11
       -
       ## Development

     

       12
       12
       -
       

     

       13
       13
       -
       this project uses nix for cross-compilation to windows xp. the key was using an older nixpkgs (22.05) since newer mingw toolchains use windows apis that don't exist in xp.

     

       14
       14
       -
       

     

       15
       15
       -
       ### Quick Start

     

       16
       16
       -
       

     

       17
       17
       -
       ```bash

     

       18
       18
       -
       # enter the dev environment (or use direnv)

     

       19
       19
       -
       nix develop

     

       20
       20
       -
       

     

       21
       21
       -
       # build the app

     

       22
       22
       -
       nix build

     

       23
       23
       -
       

     

       24
       24
       -
       # deploy to my xp vm folder

     

       25
       25
       -
       deploy-to-xp

     

       26
       26
       -
       ```

     

       27
       27
       -
       

     

       28
       28
       -
       ### Editor Setup (Zed)

     

       29
       29
       -
       

     

       30
       30
       -
       to get proper intellisense for win32 apis in zed:

     

       31
       31
       -
       

     

       32
       32
       -
       ```bash

     

       33
       33
       -
       # generate .clangd config with proper mingw headers

     

       34
       34
       -
       setup-dev

     

       3
       3
       +
       a vintage shortwave radio tuner with internet streaming for [rewind](https://rewind.hackclub.com/#)

     

       35
       4
        
       

     

       36
       36
       -
       # restart zed

     

       37
       37
       -
       ```

     

       5
       5
       +
       ![a screenshot of windows xp with the app open to Jazz Radio: Smooth Jazz](https://raw.githubusercontent.com/taciturnaxolotl/shortwave/main/.github/images/ss.webp)

     

       38
       6
        
       

     

       39
       39
       -
       this creates a `.clangd` file that points to the actual mingw-w64 headers and avoids gcc intrinsics that cause clang issues.

     

       7
       7
       +
       ### Radio Stations

     

       40
       8
        
       

     

       41
       41
       -
       ### Build Details

     

       9
       9
       +
       | Frequency (MHz) | Station Name         | Description                    |

     

       10
       10
       +
       |-----------------|---------------------|--------------------------------|

     

       11
       11
       +
       | 10.230          | SomaFM Groove       | Downtempo and chillout         |

     

       12
       12
       +
       | 11.470          | WBGO Jazz88         | Jazz from Newark               |

     

       13
       13
       +
       | 12.650          | Radio Paradise      | Eclectic music mix             |

     

       14
       14
       +
       | 13.890          | Classical Music     | Classical radio                |

     

       15
       15
       +
       | 15.120          | Jazz Radio          | Smooth jazz                    |

     

       16
       16
       +
       | 16.350          | FIP                 | Eclectic French radio          |

     

       17
       17
       +
       | 18.810          | TSF Jazz            | French jazz radio              |

     

       18
       18
       +
       | 20.040          | Dublab              | Electronic and experimental    |

     

       19
       19
       +
       | 21.270          | BBC World Service   | Global news and culture        |

     

       20
       20
       +
       | 23.730          | WFMU                | Freeform experimental radio    |

     

       21
       21
       +
       | 24.960          | ChillHop Music      | Lo-fi hip hop                  |

     

       22
       22
       +
       | 27.420          | Worldwide FM        | Global music discovery         |

     

       42
       23
        
       

     

       43
       43
       -
       - uses mingw-w64 cross-compiler targeting i686-w64-mingw32

     

       44
       44
       -
       - statically links runtime to avoid dll dependencies  

     

       45
       45
       -
       - targets windows xp (winver=0x0501) for maximum compatibility

     

       46
       46
       -
       - older nixpkgs (22.05) prevents "procedure entry point" errors on xp

     

       47
       47
       -
       

     

       48
       48
       -
       ~

     

       49
       49
       -
       

     

       50
       50
       -
       written in cpp. If you have any suggestions or issues feel free to open an issue on my [tangled](https://tangled.sh/@dunkirk.sh/shortwave) knot

     

       24
       24
       +
       written in cpp; this project uses nix for cross-compilation to windows xp. the key was using an older nixpkgs (22.05) since newer mingw toolchains use windows apis that don't exist in xp. if you have any suggestions or need to open a ticket please do so on my [tangled](https://tangled.sh/@dunkirk.sh/shortwave) knot

     

       51
       25
        
       

     

       52
       26
        
       <p align="center">

     

       53
       27
        
       	<img src="https://raw.githubusercontent.com/taciturnaxolotl/carriage/master/.github/images/line-break.svg" />

+55 -53

flake.nix

···

       67
       67
        
       

     

       68
       68
        
                   deploy-to-xp = pkgs.writeShellScriptBin "deploy-to-xp" ''

     

       69
       69
        
                     echo "rebuilding program"

     

       70
       70
       -
                     if ! nix build --rebuild; then

     

       71
       71
       -
                       echo "Rebuild failed, attempting normal build..."

     

       72
       72
       -
                       nix build

     

       73
       73
       -
                     fi

     

       70
       70
       +
                     nix build

     

       74
       71
        
       

     

       75
       72
        
                     XP_DIR="$HOME/Documents/xp-drive"

     

       76
       73
        
                     mkdir -p "$XP_DIR"

     
···

       102
       99
        
                     ls -la "$XP_DIR"/*.{exe,dll} 2>/dev/null || echo "No files found"

     

       103
       100
        
                   '';

     

       104
       101
        
       

     

       102
       102
       +
                   build-installer = pkgs.writeShellScriptBin "build-installer" ''

     

       103
       103
       +
                     echo "Building Shortwave Radio installer..."

     

       104
       104
       +
                     nix build .#installer

     

       105
       105
       +
       

     

       106
       106
       +
                     if [ -f result/bin/ShortwaveRadioInstaller.exe ]; then

     

       107
       107
       +
                       echo "✓ Installer built successfully: result/bin/ShortwaveRadioInstaller.exe"

     

       108
       108
       +
                       ls -la result/bin/ShortwaveRadioInstaller.exe

     

       109
       109
       +
                     else

     

       110
       110
       +
                       echo "✗ Installer build failed"

     

       111
       111
       +
                       exit 1

     

       112
       112
       +
                     fi

     

       113
       113
       +
                   '';

     

       114
       114
       +
       

     

       105
       115
        
                   default = self'.packages.shortwave;

     

       106
       116
        
                 };

     

       107
       117
        
       

     
···

       111
       121
        
                       cmake

     

       112
       122
        
                       pkgsCross.mingw32.buildPackages.gcc

     

       113
       123
        
                       self'.packages.deploy-to-xp

     

       124
       124
       +
                       self'.packages.build-installer

     

       125
       125
       +
                       nsis

     

       114
       126
        
                     ];

     

       115
       127
        
       

     

       116
       128
        
                     shellHook = ''

     

       117
       117
       -
                                       echo "Shortwave Radio development environment loaded"

     

       118
       118
       -
                                       echo "Available commands:"

     

       119
       119
       -
                                       echo "  nix build     - Build the Shortwave Radio application"

     

       120
       120
       -
                                       echo "  deploy-to-xp  - Deploy to XP VM folder"

     

       121
       121
       -
                                       echo ""

     

       122
       122
       -
                                       echo "Setting up development environment..."

     

       123
       123
       -
       

     

       124
       124
       -
                                       # Get dynamic paths from nix packages

     

       125
       125
       -
                                       GCC_BASE="${pkgs.pkgsCross.mingw32.buildPackages.gcc}/i686-w64-mingw32"

     

       126
       126
       -
                                       SYS_INCLUDE="$GCC_BASE/sys-include"

     

       127
       127
       -
                                       MINGW_MAIN_INCLUDE="${pkgs.pkgsCross.mingw32.windows.mingw_w64.dev}/include"

     

       128
       128
       -
                                       CPP_INCLUDE="${pkgs.lib.getDev pkgs.pkgsCross.mingw32.buildPackages.gcc}/include/c++/10.3.0"

     

       129
       129
       -
                                       CPP_TARGET_INCLUDE="$CPP_INCLUDE/i686-w64-mingw32"

     

       130
       130
       -
       

     

       131
       131
       -
                                       # Auto-generate .clangd config with correct paths

     

       132
       132
       -
                                       cat > .clangd << EOF

     

       133
       133
       -
                       CompileFlags:

     

       134
       134
       -
                         Add:

     

       135
       135
       -
                           - -target

     

       136
       136
       -
                           - i686-w64-mingw32

     

       137
       137
       -
                           - -DWINVER=0x0501

     

       138
       138
       -
                           - -D_WIN32_WINNT=0x0501

     

       139
       139
       -
                           - -DWIN32_LEAN_AND_MEAN

     

       140
       140
       -
                           - -D_WIN32

     

       141
       141
       -
                           - -DWIN32

     

       142
       142
       -
                           - -std=c++17

     

       143
       143
       -
                           - -fno-builtin

     

       144
       144
       -
                           - -isystem

     

       145
       145
       -
                           - $SYS_INCLUDE

     

       146
       146
       -
                           - -isystem

     

       147
       147
       -
                           - $MINGW_MAIN_INCLUDE

     

       148
       148
       -
                           - -isystem

     

       149
       149
       -
                           - $CPP_INCLUDE

     

       150
       150
       -
                           - -isystem

     

       151
       151
       -
                           - $CPP_TARGET_INCLUDE

     

       152
       152
       -
                         Remove:

     

       153
       153
       -
                           - -I*/gcc/*/include

     

       154
       154
       -
                       EOF

     

       129
       129
       +
                       # Get dynamic paths from nix packages

     

       130
       130
       +
                       GCC_BASE="${pkgs.pkgsCross.mingw32.buildPackages.gcc}/i686-w64-mingw32"

     

       131
       131
       +
                       SYS_INCLUDE="$GCC_BASE/sys-include"

     

       132
       132
       +
                       MINGW_MAIN_INCLUDE="${pkgs.pkgsCross.mingw32.windows.mingw_w64.dev}/include"

     

       133
       133
       +
                       CPP_INCLUDE="${pkgs.lib.getDev pkgs.pkgsCross.mingw32.buildPackages.gcc}/include/c++/10.3.0"

     

       134
       134
       +
                       CPP_TARGET_INCLUDE="$CPP_INCLUDE/i686-w64-mingw32"

     

       155
       135
        
       

     

       156
       156
       -
                                       cat > compile_commands.json << EOF

     

       157
       157
       -
                       [

     

       158
       158
       -
                         {

     

       159
       159
       -
                           "directory": "$(pwd)",

     

       160
       160
       -
                           "command": "i686-w64-mingw32-g++ -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 -DWIN32_LEAN_AND_MEAN -D_WIN32 -DWIN32 -std=c++17 -isystem \"$SYS_INCLUDE\" -isystem \"$MINGW_MAIN_INCLUDE\" -isystem \"$CPP_INCLUDE\" -isystem \"$CPP_TARGET_INCLUDE\" -c main.cpp",

     

       161
       161
       -
                           "file": "main.cpp"

     

       162
       162
       -
                         }

     

       163
       163
       -
                       ]

     

       164
       164
       -
                       EOF

     

       136
       136
       +
                       # Auto-generate .clangd config with correct paths

     

       137
       137
       +
                       cat > .clangd <<EOF

     

       138
       138
       +
                           CompileFlags:

     

       139
       139
       +
                               Add:

     

       140
       140
       +
                               - -target

     

       141
       141
       +
                               - i686-w64-mingw32

     

       142
       142
       +
                               - -DWINVER=0x0501

     

       143
       143
       +
                               - -D_WIN32_WINNT=0x0501

     

       144
       144
       +
                               - -DWIN32_LEAN_AND_MEAN

     

       145
       145
       +
                               - -D_WIN32

     

       146
       146
       +
                               - -DWIN32

     

       147
       147
       +
                               - -std=c++17

     

       148
       148
       +
                               - -fno-builtin

     

       149
       149
       +
                               - -isystem

     

       150
       150
       +
                               - $SYS_INCLUDE

     

       151
       151
       +
                               - -isystem

     

       152
       152
       +
                               - $MINGW_MAIN_INCLUDE

     

       153
       153
       +
                               - -isystem

     

       154
       154
       +
                               - $CPP_INCLUDE

     

       155
       155
       +
                               - -isystem

     

       156
       156
       +
                               - $CPP_TARGET_INCLUDE

     

       157
       157
       +
                               Remove:

     

       158
       158
       +
                               - -I*/gcc/*/include

     

       159
       159
       +
                           EOF

     

       165
       160
        
       

     

       166
       166
       -
                                       echo "✓ Generated .clangd config and compile_commands.json with include paths"

     

       167
       167
       -
                                       echo "✓ Development environment ready for Shortwave Radio development"

     

       161
       161
       +
                       cat > compile_commands.json <<EOF

     

       162
       162
       +
                           [

     

       163
       163
       +
                             {

     

       164
       164
       +
                               "directory": "$(pwd)",

     

       165
       165
       +
                               "command": "i686-w64-mingw32-g++ -DWINVER=0x0501 -D_WIN32_WINNT=0x0501 -DWIN32_LEAN_AND_MEAN -D_WIN32 -DWIN32 -std=c++17 -isystem \"$SYS_INCLUDE\" -isystem \"$MINGW_MAIN_INCLUDE\" -isystem \"$CPP_INCLUDE\" -isystem \"$CPP_TARGET_INCLUDE\" -c main.cpp",

     

       166
       166
       +
                               "file": "main.cpp"

     

       167
       167
       +
                             }

     

       168
       168
       +
                           ]

     

       169
       169
       +
                           EOF

     

       168
       170
        
                     '';

     

       169
       171
        
                   };

     

       170
       172
        
                 };

icon.aseprite

This is a binary file and will not be displayed.

+114

installer.nsi

···

       1
       1
       +
       ; Shortwave Radio Installer

     

       2
       2
       +
       ; Compatible with Windows XP and later

     

       3
       3
       +
       

     

       4
       4
       +
       !define APPNAME "Shortwave Radio"

     

       5
       5
       +
       !define COMPANYNAME "Kieran Klukas"

     

       6
       6
       +
       !define DESCRIPTION "Vintage Shortwave Radio Tuner with Internet Streaming"

     

       7
       7
       +
       !define VERSIONMAJOR 1

     

       8
       8
       +
       !define VERSIONMINOR 0

     

       9
       9
       +
       !define VERSIONBUILD 0

     

       10
       10
       +
       !define HELPURL "https://github.com/taciturnaxolotl/shortwave"

     

       11
       11
       +
       !define UPDATEURL "https://github.com/taciturnaxolotl/shortwave/releases"

     

       12
       12
       +
       !define ABOUTURL "https://github.com/taciturnaxolotl/shortwave"

     

       13
       13
       +
       !define INSTALLSIZE 2048

     

       14
       14
       +
       

     

       15
       15
       +
       ; Disable CRC check to avoid cross-platform issues

     

       16
       16
       +
       CRCCheck off

     

       17
       17
       +
       ; Use solid compression

     

       18
       18
       +
       SetCompressor /SOLID lzma

     

       19
       19
       +
       

     

       20
       20
       +
       RequestExecutionLevel admin

     

       21
       21
       +
       InstallDir "$PROGRAMFILES\${APPNAME}"

     

       22
       22
       +
       Name "${APPNAME}"

     

       23
       23
       +
       outFile "ShortwaveRadioInstaller.exe"

     

       24
       24
       +
       

     

       25
       25
       +
       !include LogicLib.nsh

     

       26
       26
       +
       

     

       27
       27
       +
       page directory

     

       28
       28
       +
       page instfiles

     

       29
       29
       +
       

     

       30
       30
       +
       !macro VerifyUserIsAdmin

     

       31
       31
       +
       UserInfo::GetAccountType

     

       32
       32
       +
       pop $0

     

       33
       33
       +
       ${If} $0 != "admin"

     

       34
       34
       +
           messageBox mb_iconstop "Administrator rights required!"

     

       35
       35
       +
           setErrorLevel 740

     

       36
       36
       +
           quit

     

       37
       37
       +
       ${EndIf}

     

       38
       38
       +
       !macroend

     

       39
       39
       +
       

     

       40
       40
       +
       function .onInit

     

       41
       41
       +
           setShellVarContext all

     

       42
       42
       +
           !insertmacro VerifyUserIsAdmin

     

       43
       43
       +
       functionEnd

     

       44
       44
       +
       

     

       45
       45
       +
       section "install"

     

       46
       46
       +
           setOutPath $INSTDIR

     

       47
       47
       +
       

     

       48
       48
       +
           ; Main executable

     

       49
       49
       +
           file "result/bin/Shortwave.exe"

     

       50
       50
       +
       

     

       51
       51
       +
           ; BASS audio library

     

       52
       52
       +
           file "libs/bass.dll"

     

       53
       53
       +
       

     

       54
       54
       +
           ; License and documentation

     

       55
       55
       +
           file "LICENSE.md"

     

       56
       56
       +
           file "README.md"

     

       57
       57
       +
       

     

       58
       58
       +
           ; Create uninstaller

     

       59
       59
       +
           writeUninstaller "$INSTDIR\uninstall.exe"

     

       60
       60
       +
       

     

       61
       61
       +
           ; Start menu shortcuts

     

       62
       62
       +
           createDirectory "$SMPROGRAMS\${APPNAME}"

     

       63
       63
       +
           createShortCut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\Shortwave.exe"

     

       64
       64
       +
           createShortCut "$SMPROGRAMS\${APPNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"

     

       65
       65
       +
       

     

       66
       66
       +
           ; Desktop shortcut

     

       67
       67
       +
           createShortCut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\Shortwave.exe"

     

       68
       68
       +
       

     

       69
       69
       +
           ; Registry entries for Add/Remove Programs

     

       70
       70
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME} - ${DESCRIPTION}"

     

       71
       71
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""

     

       72
       72
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"

     

       73
       73
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$\"$INSTDIR$\""

     

       74
       74
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\Shortwave.exe$\""

     

       75
       75
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${COMPANYNAME}"

     

       76
       76
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "HelpLink" "${HELPURL}"

     

       77
       77
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "URLUpdateInfo" "${UPDATEURL}"

     

       78
       78
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "URLInfoAbout" "${ABOUTURL}"

     

       79
       79
       +
           WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}"

     

       80
       80
       +
           WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR}

     

       81
       81
       +
           WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR}

     

       82
       82
       +
           WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1

     

       83
       83
       +
           WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1

     

       84
       84
       +
           WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" ${INSTALLSIZE}

     

       85
       85
       +
       sectionEnd

     

       86
       86
       +
       

     

       87
       87
       +
       function un.onInit

     

       88
       88
       +
           SetShellVarContext all

     

       89
       89
       +
           MessageBox MB_OKCANCEL "Remove ${APPNAME}?" IDOK next

     

       90
       90
       +
               Abort

     

       91
       91
       +
           next:

     

       92
       92
       +
           !insertmacro VerifyUserIsAdmin

     

       93
       93
       +
       functionEnd

     

       94
       94
       +
       

     

       95
       95
       +
       section "uninstall"

     

       96
       96
       +
           ; Remove files

     

       97
       97
       +
           delete "$INSTDIR\Shortwave.exe"

     

       98
       98
       +
           delete "$INSTDIR\bass.dll"

     

       99
       99
       +
           delete "$INSTDIR\LICENSE.md"

     

       100
       100
       +
           delete "$INSTDIR\README.md"

     

       101
       101
       +
           delete "$INSTDIR\uninstall.exe"

     

       102
       102
       +
       

     

       103
       103
       +
           ; Remove shortcuts

     

       104
       104
       +
           delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"

     

       105
       105
       +
           delete "$SMPROGRAMS\${APPNAME}\Uninstall.lnk"

     

       106
       106
       +
           rmDir "$SMPROGRAMS\${APPNAME}"

     

       107
       107
       +
           delete "$DESKTOP\${APPNAME}.lnk"

     

       108
       108
       +
       

     

       109
       109
       +
           ; Remove registry entries

     

       110
       110
       +
           DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"

     

       111
       111
       +
       

     

       112
       112
       +
           ; Remove installation directory

     

       113
       113
       +
           rmDir "$INSTDIR"

     

       114
       114
       +
       sectionEnd

+62 -22

main.cpp

···

       27
       27
        
       } RadioStation;

     

       28
       28
        
       

     

       29
       29
        
       RadioStation g_stations[] = {

     

       30
       30
       -
       	{14.230f, "SomaFM Groove", "Downtempo and chillout", "http://ice1.somafm.com/groovesalad-128-mp3"},

     

       31
       31
       -
       	{15.770f, "Radio Paradise", "Eclectic music mix", "http://stream.radioparadise.com/mp3-128"},

     

       32
       32
       -
       	{17.895f, "Jazz Radio", "Smooth jazz", "http://jazz-wr04.ice.infomaniak.ch/jazz-wr04-128.mp3"},

     

       33
       33
       -
       	{21.500f, "Classical Music", "Classical radio", "http://stream.wqxr.org/wqxr"},

     

       30
       30
       +
       	{10.230f, "SomaFM Groove", "Downtempo and chillout", "http://ice1.somafm.com/groovesalad-128-mp3"},

     

       31
       31
       +
       	{11.470f, "WBGO Jazz88", "Jazz from Newark", "http://wbgo.streamguys.net/wbgo128"},

     

       32
       32
       +
       	{12.650f, "Radio Paradise", "Eclectic music mix", "http://stream.radioparadise.com/mp3-128"},

     

       33
       33
       +
       	{13.890f, "Classical Music", "Classical radio", "http://stream.wqxr.org/wqxr"},

     

       34
       34
       +
       	{15.120f, "Jazz Radio", "Smooth jazz", "http://jazz-wr04.ice.infomaniak.ch/jazz-wr04-128.mp3"},

     

       35
       35
       +
       	{16.350f, "FIP", "Eclectic French radio", "http://direct.fipradio.fr/live/fip-midfi.mp3"},

     

       36
       36
       +
       	{18.810f, "TSF Jazz", "French jazz radio", "http://tsfjazz.ice.infomaniak.ch/tsfjazz-high.mp3"},

     

       37
       37
       +
       	{20.040f, "Dublab", "Electronic and experimental", "http://dublab.out.airtime.pro:8000/dublab_a"},

     

       38
       38
       +
       	{21.270f, "BBC World Service", "Global news and culture", "http://stream.live.vc.bbcmedia.co.uk/bbc_world_service"},

     

       39
       39
       +
       	{23.730f, "WFMU", "Freeform experimental radio", "http://stream0.wfmu.org/freeform-128k"},

     

       40
       40
       +
       	{24.960f, "ChillHop Music", "Lo-fi hip hop", "http://ice1.somafm.com/fluid"},

     

       41
       41
       +
       	{27.420f, "Worldwide FM", "Global music discovery", "http://worldwidefm.out.airtime.pro:8000/worldwidefm_a"},

     

       34
       42
        
       };

     

       35
       43
        
       

     

       36
       44
        
       #define NUM_STATIONS (sizeof(g_stations) / sizeof(RadioStation))

     
···

       104
       112
        
       void StartStaticNoise();

     

       105
       113
        
       void StopStaticNoise();

     

       106
       114
        
       void UpdateStaticVolume(float signalStrength);

     

       115
       115
       +
       void UpdateStreamVolume();

     

       107
       116
        
       

     

       108
       117
        
       // VU meter functions

     

       109
       118
        
       void UpdateVULevels();

     

       110
       119
        
       

     

       111
       120
        
       int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow) {

     

       112
       121
        
       	// Don't allocate console by default - will be toggled via menu

     

       113
       113
       -
       	

     

       122
       122
       +
       

     

       114
       123
        
       	const char* CLASS_NAME = "ShortwaveRadio";

     

       115
       124
        
       

     

       116
       125
        
       	WNDCLASS wc = {};

     
···

       304
       313
        
       					if (g_radio.signalStrength > 100) g_radio.signalStrength = 100;

     

       305
       314
        
       

     

       306
       315
        
       					UpdateStaticVolume(g_radio.signalStrength);

     

       316
       316
       +
       					UpdateStreamVolume();

     

       307
       317
        
       					InvalidateRect(hwnd, NULL, TRUE);

     

       308
       318
        
       					break;

     

       309
       319
        
       				}

     
···

       330
       340
        
       					if (g_radio.signalStrength > 100) g_radio.signalStrength = 100;

     

       331
       341
        
       

     

       332
       342
        
       					UpdateStaticVolume(g_radio.signalStrength);

     

       343
       343
       +
       					UpdateStreamVolume();

     

       333
       344
        
       					InvalidateRect(hwnd, NULL, TRUE);

     

       334
       345
        
       					break;

     

       335
       346
        
       				}

     
···

       356
       367
        
       					if (g_radio.signalStrength > 100) g_radio.signalStrength = 100;

     

       357
       368
        
       

     

       358
       369
        
       					UpdateStaticVolume(g_radio.signalStrength);

     

       370
       370
       +
       					UpdateStreamVolume();

     

       359
       371
        
       					InvalidateRect(hwnd, NULL, TRUE);

     

       360
       372
        
       					break;

     

       361
       373
        
       				}

     
···

       382
       394
        
       					if (g_radio.signalStrength > 100) g_radio.signalStrength = 100;

     

       383
       395
        
       

     

       384
       396
        
       					UpdateStaticVolume(g_radio.signalStrength);

     

       397
       397
       +
       					UpdateStreamVolume();

     

       385
       398
        
       					InvalidateRect(hwnd, NULL, TRUE);

     

       386
       399
        
       					break;

     

       387
       400
        
       				}

     
···

       463
       476
        
       

     

       464
       477
        
       	// Main panel with simplified metallic gradient effect

     

       465
       478
        
       	RECT panel = {10, 10, rect->right - 10, rect->bottom - 10};

     

       466
       466
       -
       	

     

       479
       479
       +
       

     

       467
       480
        
       	// Simplified gradient effect with fewer steps

     

       468
       481
        
       	for (int i = 0; i < 8; i++) {

     

       469
       482
        
       		int gray = 45 + i * 3;

     
···

       517
       530
        
       	RadioStation* currentStation = FindNearestStation(g_radio.frequency);

     

       518
       531
        
       	if (currentStation && g_radio.signalStrength > 30) {

     

       519
       532
        
       		RECT stationRect = {50, 320, 550, 360};

     

       520
       520
       -
       		

     

       533
       533
       +
       

     

       521
       534
        
       		// Winamp-style display background

     

       522
       535
        
       		HBRUSH displayBrush = CreateSolidBrush(RGB(0, 0, 0));

     

       523
       536
        
       		FillRect(hdc, &stationRect, displayBrush);

     
···

       526
       539
        
       		// Beveled border

     

       527
       540
        
       		HPEN lightBorderPen = CreatePen(PS_SOLID, 1, RGB(64, 64, 64));

     

       528
       541
        
       		HPEN darkBorderPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));

     

       529
       529
       -
       		

     

       542
       542
       +
       

     

       530
       543
        
       		SelectObject(hdc, darkBorderPen);

     

       531
       544
        
       		MoveToEx(hdc, stationRect.left, stationRect.bottom, NULL);

     

       532
       545
        
       		LineTo(hdc, stationRect.left, stationRect.top);

     

       533
       546
        
       		LineTo(hdc, stationRect.right, stationRect.top);

     

       534
       534
       -
       		

     

       547
       547
       +
       

     

       535
       548
        
       		SelectObject(hdc, lightBorderPen);

     

       536
       549
        
       		LineTo(hdc, stationRect.right, stationRect.bottom);

     

       537
       550
        
       		LineTo(hdc, stationRect.left, stationRect.bottom);

     

       538
       538
       -
       		

     

       551
       551
       +
       

     

       539
       552
        
       		DeleteObject(lightBorderPen);

     

       540
       553
        
       		DeleteObject(darkBorderPen);

     

       541
       554
        
       

     
···

       562
       575
        
       void DrawFrequencyDisplay(HDC hdc, int x, int y, float frequency) {

     

       563
       576
        
       	// Winamp-style LCD display with beveled edges

     

       564
       577
        
       	RECT display = {x - 100, y - 25, x + 100, y + 25};

     

       565
       565
       -
       	

     

       578
       578
       +
       

     

       566
       579
        
       	// Dark background

     

       567
       580
        
       	HBRUSH blackBrush = CreateSolidBrush(RGB(0, 0, 0));

     

       568
       581
        
       	FillRect(hdc, &display, blackBrush);

     
···

       596
       609
        
       	sprintf(freqText, "%.3f MHz", frequency);

     

       597
       610
        
       

     

       598
       611
        
       	SetBkMode(hdc, TRANSPARENT);

     

       599
       599
       -
       	

     

       612
       612
       +
       

     

       600
       613
        
       	// Create glow effect by drawing text multiple times with slight offsets

     

       601
       614
        
       	HFONT lcdFont = CreateFont(20, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE,

     

       602
       615
        
       							  DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,

     
···

       780
       793
        
       void DrawSignalMeter(HDC hdc, int x, int y, int strength) {

     

       781
       794
        
       	// Winamp-style meter background with bevel

     

       782
       795
        
       	RECT meter = {x, y, x + 80, y + 20};

     

       783
       783
       -
       	

     

       796
       796
       +
       

     

       784
       797
        
       	// Dark background

     

       785
       798
        
       	HBRUSH meterBrush = CreateSolidBrush(RGB(16, 16, 16));

     

       786
       799
        
       	FillRect(hdc, &meter, meterBrush);

     
···

       846
       859
        
       void DrawVUMeter(HDC hdc, int x, int y, float leftLevel, float rightLevel) {

     

       847
       860
        
       	// Winamp-style VU meter with classic look

     

       848
       861
        
       	RECT meterBg = {x, y, x + 80, y + 40};

     

       849
       849
       -
       	

     

       862
       862
       +
       

     

       850
       863
        
       	// Dark background

     

       851
       864
        
       	HBRUSH bgBrush = CreateSolidBrush(RGB(16, 16, 16));

     

       852
       865
        
       	FillRect(hdc, &meterBg, bgBrush);

     
···

       882
       895
        
       	int leftWidth = (int)(leftLevel * 65);

     

       883
       896
        
       	if (leftWidth > 0) {

     

       884
       897
        
       		RECT leftBar = {x + 8, y + 12, x + 8 + leftWidth, y + 17};

     

       885
       885
       -
       		

     

       898
       898
       +
       

     

       886
       899
        
       		// Determine color based on level

     

       887
       900
        
       		COLORREF leftColor;

     

       888
       901
        
       		if (leftLevel > 0.8f) leftColor = RGB(255, 64, 64);      // Red

     
···

       909
       922
        
       	int rightWidth = (int)(rightLevel * 65);

     

       910
       923
        
       	if (rightWidth > 0) {

     

       911
       924
        
       		RECT rightBar = {x + 8, y + 22, x + 8 + rightWidth, y + 27};

     

       912
       912
       -
       		

     

       925
       925
       +
       

     

       913
       926
        
       		// Determine color based on level

     

       914
       927
        
       		COLORREF rightColor;

     

       915
       928
        
       		if (rightLevel > 0.8f) rightColor = RGB(255, 64, 64);     // Red

     
···

       1052
       1065
        
       	if (g_radio.signalStrength > 100) g_radio.signalStrength = 100;

     

       1053
       1066
        
       

     

       1054
       1067
        
       	UpdateStaticVolume(g_radio.signalStrength);

     

       1068
       1068
       +
       	UpdateStreamVolume();

     

       1055
       1069
        
       }

     

       1056
       1070
        
       

     

       1057
       1071
        
       void UpdateVolumeFromMouse(int mouseX, int mouseY) {

     
···

       1067
       1081
        
       	if (g_radio.volume < 0.0f) g_radio.volume = 0.0f;

     

       1068
       1082
        
       	if (g_radio.volume > 1.0f) g_radio.volume = 1.0f;

     

       1069
       1083
        
       

     

       1070
       1070
       -
       	// Update static volume when main volume changes

     

       1084
       1084
       +
       	// Update volumes when main volume changes

     

       1071
       1085
        
       	UpdateStaticVolume(g_radio.signalStrength);

     

       1086
       1086
       +
       	UpdateStreamVolume();

     

       1072
       1087
        
       }

     

       1073
       1088
        
       

     

       1074
       1089
        
       int InitializeAudio() {

     
···

       1322
       1337
        
       	}

     

       1323
       1338
        
       }

     

       1324
       1339
        
       

     

       1340
       1340
       +
       void UpdateStreamVolume() {

     

       1341
       1341
       +
       	if (g_audio.currentStream) {

     

       1342
       1342
       +
       		// Stream volume based on signal strength and radio volume

     

       1343
       1343
       +
       		float volume = g_radio.volume * (g_radio.signalStrength / 100.0f);

     

       1344
       1344
       +
       		BASS_ChannelSetAttribute(g_audio.currentStream, BASS_ATTRIB_VOL, volume);

     

       1345
       1345
       +
       		if (g_consoleVisible) {

     

       1346
       1346
       +
       			printf("Updated stream volume to: %.2f\n", volume);

     

       1347
       1347
       +
       		}

     

       1348
       1348
       +
       	}

     

       1349
       1349
       +
       }

     

       1350
       1350
       +
       

     

       1325
       1351
        
       void UpdateVULevels() {

     

       1326
       1352
        
       	// Initialize levels to zero

     

       1327
       1353
        
       	g_audio.vuLevelLeft = 0.0f;

     
···

       1331
       1357
        
       	if (g_audio.currentStream && BASS_ChannelIsActive(g_audio.currentStream) == BASS_ACTIVE_PLAYING) {

     

       1332
       1358
        
       		DWORD level = BASS_ChannelGetLevel(g_audio.currentStream);

     

       1333
       1359
        
       		if (level != -1) {

     

       1334
       1334
       -
       			// Extract left and right channel levels

     

       1335
       1335
       -
       			g_audio.vuLevelLeft = (float)LOWORD(level) / 32768.0f;

     

       1336
       1336
       -
       			g_audio.vuLevelRight = (float)HIWORD(level) / 32768.0f;

     

       1360
       1360
       +
       			// Extract left and right channel levels and apply volume scaling

     

       1361
       1361
       +
       			float rawLeft = (float)LOWORD(level) / 32768.0f;

     

       1362
       1362
       +
       			float rawRight = (float)HIWORD(level) / 32768.0f;

     

       1363
       1363
       +
       

     

       1364
       1364
       +
       			// Apply the same volume scaling as the actual audio output

     

       1365
       1365
       +
       			float streamVolume = g_radio.volume * (g_radio.signalStrength / 100.0f);

     

       1366
       1366
       +
       			g_audio.vuLevelLeft = rawLeft * streamVolume;

     

       1367
       1367
       +
       			g_audio.vuLevelRight = rawRight * streamVolume;

     

       1337
       1368
        
       		}

     

       1338
       1369
        
       	}

     

       1339
       1370
        
       

     
···

       1344
       1375
        
       			float staticLeft = (float)LOWORD(staticLevel) / 32768.0f;

     

       1345
       1376
        
       			float staticRight = (float)HIWORD(staticLevel) / 32768.0f;

     

       1346
       1377
        
       

     

       1378
       1378
       +
       			// Apply static volume scaling

     

       1379
       1379
       +
       			float staticVolume = (100.0f - g_radio.signalStrength) / 100.0f;

     

       1380
       1380
       +
       			float scaledStaticVolume = g_radio.volume * staticVolume * g_audio.staticVolume;

     

       1381
       1381
       +
       

     

       1382
       1382
       +
       			// Ensure minimum static when radio is on but no strong signal

     

       1383
       1383
       +
       			if (g_radio.power && g_radio.signalStrength < 50.0f) {

     

       1384
       1384
       +
       				scaledStaticVolume = fmax(scaledStaticVolume, g_radio.volume * 0.1f);

     

       1385
       1385
       +
       			}

     

       1386
       1386
       +
       

     

       1347
       1387
        
       			// Combine with existing levels (simulate mixing)

     

       1348
       1348
       -
       			g_audio.vuLevelLeft = fmin(1.0f, g_audio.vuLevelLeft + staticLeft * 0.3f);

     

       1349
       1349
       -
       			g_audio.vuLevelRight = fmin(1.0f, g_audio.vuLevelRight + staticRight * 0.3f);

     

       1388
       1388
       +
       			g_audio.vuLevelLeft = fmin(1.0f, g_audio.vuLevelLeft + staticLeft * scaledStaticVolume * 0.3f);

     

       1389
       1389
       +
       			g_audio.vuLevelRight = fmin(1.0f, g_audio.vuLevelRight + staticRight * scaledStaticVolume * 0.3f);

     

       1350
       1390
        
       		}

     

       1351
       1391
        
       	}

     

       1352
       1392

shortwave.ico

This is a binary file and will not be displayed.

shortwave.rc

···

       1
       1
       +
       IDI_ICON1 ICON DISCARDABLE "shortwave.ico"

Compare changes