From 1010d29be800ff5308f23070ae58d65037e41c5b Mon Sep 17 00:00:00 2001 From: Diggory Laycock Date: Wed, 5 Oct 2022 18:21:33 +0100 Subject: [PATCH] Swaps .caf file for .mp3 for notification sound .caf files don't appear to work on macOS notifications, and mp3s appear to work on both iOS and macOS, so swapped file format. --- Mac/AppAssets.swift | 2 +- NetNewsWire.xcodeproj/project.pbxproj | 12 ++++++++---- Shared/Resources/notificationSoundBlip.caf | Bin 7224 -> 0 bytes Shared/Resources/notificationSoundBlip.mp3 | Bin 0 -> 1902 bytes iOS/AppAssets.swift | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 Shared/Resources/notificationSoundBlip.caf create mode 100644 Shared/Resources/notificationSoundBlip.mp3 diff --git a/Mac/AppAssets.swift b/Mac/AppAssets.swift index 1c37e71fd..21c22c35a 100644 --- a/Mac/AppAssets.swift +++ b/Mac/AppAssets.swift @@ -297,7 +297,7 @@ struct AppAssets { static var notificationSoundBlipFileName: String = { // https://freesound.org/people/cabled_mess/sounds/350862/ - return "notificationSoundBlip.caf" + return "notificationSoundBlip.mp3" }() diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj index a8f4adbf3..02bb24a27 100644 --- a/NetNewsWire.xcodeproj/project.pbxproj +++ b/NetNewsWire.xcodeproj/project.pbxproj @@ -853,7 +853,9 @@ D5F4EDB720074D6500B9E363 /* WebFeed+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F4EDB620074D6500B9E363 /* WebFeed+Scriptability.swift */; }; D5F4EDB920074D7C00B9E363 /* Folder+Scriptability.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F4EDB820074D7C00B9E363 /* Folder+Scriptability.swift */; }; DD82AB0A231003F6002269DF /* SharingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD82AB09231003F6002269DF /* SharingTests.swift */; }; - DDE6A35128E8741F00612823 /* notificationSoundBlip.caf in Resources */ = {isa = PBXBuildFile; fileRef = DDE6A35028E8741F00612823 /* notificationSoundBlip.caf */; }; + DDF9E1D728EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DDF9E1D628EDF2FC000BC355 /* notificationSoundBlip.mp3 */; }; + DDF9E1D828EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DDF9E1D628EDF2FC000BC355 /* notificationSoundBlip.mp3 */; }; + DDF9E1D928EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = DDF9E1D628EDF2FC000BC355 /* notificationSoundBlip.mp3 */; }; DF5AD10128D6922200CA3BF7 /* SmartFeedSummaryWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1768144D2564BCE000D98635 /* SmartFeedSummaryWidget.swift */; }; DFD6AACF27ADE86E00463FAD /* NewsFax.nnwtheme in Resources */ = {isa = PBXBuildFile; fileRef = DFD6AACD27ADE86E00463FAD /* NewsFax.nnwtheme */; }; DFFB8FC2279B75E300AC21D7 /* Account in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 51BC2F4A24D343A500E90810 /* Account */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -1596,7 +1598,7 @@ D5F4EDB620074D6500B9E363 /* WebFeed+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WebFeed+Scriptability.swift"; sourceTree = ""; }; D5F4EDB820074D7C00B9E363 /* Folder+Scriptability.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Folder+Scriptability.swift"; sourceTree = ""; }; DD82AB09231003F6002269DF /* SharingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SharingTests.swift; sourceTree = ""; }; - DDE6A35028E8741F00612823 /* notificationSoundBlip.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = notificationSoundBlip.caf; sourceTree = ""; }; + DDF9E1D628EDF2FC000BC355 /* notificationSoundBlip.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = notificationSoundBlip.mp3; sourceTree = ""; }; DFD6AACB27ADE80900463FAD /* NewsFax.nnwtheme */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = NewsFax.nnwtheme; sourceTree = ""; }; DFD6AACD27ADE86E00463FAD /* NewsFax.nnwtheme */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = NewsFax.nnwtheme; sourceTree = ""; }; DFFC199727A0D0D7004B7AEF /* NotificationsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationsViewController.swift; sourceTree = ""; }; @@ -1860,7 +1862,7 @@ 511D43CE231FA51100FB1562 /* Resources */ = { isa = PBXGroup; children = ( - DDE6A35028E8741F00612823 /* notificationSoundBlip.caf */, + DDF9E1D628EDF2FC000BC355 /* notificationSoundBlip.mp3 */, DFD6AACB27ADE80900463FAD /* NewsFax.nnwtheme */, 51DEE81126FB9233006DAA56 /* Appanoose.nnwtheme */, 51077C5727A86D16000C71DB /* Hyperlegible.nnwtheme */, @@ -3392,6 +3394,7 @@ 65ED405D235DEF6C0081F399 /* SidebarKeyboardShortcuts.plist in Resources */, 514A89A3244FD63F0085E65D /* AddTwitterFeedSheet.xib in Resources */, 51D0214726ED617100FF2E0F /* core.css in Resources */, + DDF9E1D828EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */, 5103A9F5242258C600410853 /* AccountsAddCloudKit.xib in Resources */, 65ED405E235DEF6C0081F399 /* DefaultFeeds.opml in Resources */, 51333D3C2468615D00EB5C91 /* AddRedditFeedSheet.xib in Resources */, @@ -3448,9 +3451,9 @@ 51F85BF32272531500C787DC /* Dedication.rtf in Resources */, 51077C5A27A86D16000C71DB /* Hyperlegible.nnwtheme in Resources */, 516A09422361248000EAE89B /* Inspector.storyboard in Resources */, + DDF9E1D928EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */, 51DEE81A26FBFF84006DAA56 /* Promenade.nnwtheme in Resources */, 1768140B2564BB8300D98635 /* NetNewsWire_iOSwidgetextension_target.xcconfig in Resources */, - DDE6A35128E8741F00612823 /* notificationSoundBlip.caf in Resources */, 5103A9B424216A4200410853 /* blank.html in Resources */, 51D0214826ED617100FF2E0F /* core.css in Resources */, 84C9FCA42262A1B800D921D6 /* LaunchScreenPhone.storyboard in Resources */, @@ -3499,6 +3502,7 @@ B27EEBF9244D15F3000932E6 /* stylesheet.css in Resources */, 5144EA3B227A379E00D19003 /* ImportOPMLSheet.xib in Resources */, 844B5B691FEA20DF00C7C76A /* SidebarKeyboardShortcuts.plist in Resources */, + DDF9E1D728EDF2FC000BC355 /* notificationSoundBlip.mp3 in Resources */, 5103A9F4242258C600410853 /* AccountsAddCloudKit.xib in Resources */, 51077C5827A86D16000C71DB /* Hyperlegible.nnwtheme in Resources */, 84A3EE5F223B667F00557320 /* DefaultFeeds.opml in Resources */, diff --git a/Shared/Resources/notificationSoundBlip.caf b/Shared/Resources/notificationSoundBlip.caf deleted file mode 100644 index 07c4a8a62b6f062cdaeffb2c7a7bd501b1879dce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7224 zcmeI1PjB1E8ODc7+%?zTjYuyF1qE7(WD?gY(wH-HFFovfsChq;Ppa1LPeL-MBU_oF(U_oF(U_oF(U_oF(U_oF(U_oF(;D;gb z>GtQ_)suew8@%KD{GagBdc8eA$@3%*eZ4NdE*H|WjM4E~o-Oe#jiX>-$aY&u&TXTY zJe(G39;Lyc+4ZD&`wuR-WsZ(dvm(usG#nT-jJdASdsJrAe0DR9!(dR~@(`G-zyjo|ODY6KR=vVm8fi6r8#%+MWv-8jhD^iTL@AFzC1FfZVZHjXi>q#8DJ1 zH^rv#T<)w)OrxI^1rC@3M$_|za2(63v9Q47F!$N@eVn`PIS%LCV#jA?Rwj8E44HeI zPVMsd*3I4V6YL^SqiERJ0(;@uwz=!mx_Od>PuFSBijj-CXW)rpETIM+fP4Q)q03_| z0iK(4aBMFxN@5=dPuIYxO`GOcZ7)A1o^j&$TV7WP>4MOuYv5VrDb@%vOmlG(f`KJ6 zNTC1U!xkM-a@W>ICuezig3W=@P8T?ZwOZ@He~6M`cA}P`xnN%#Vcm3+hnQfQf6z{;qJWiB5p z_E>sATBf-JWBk=1}cT6EsKGW0tdwb#WxcSbEgs_&4n@`L~KpCmi7e*Elp_UG|)FX zz|4icS|iBmB+WyxN1wf#bfG!3)=$n#45N4YMzxO#0OD1sP zZ(N!*TxmHPP)Sf~2kgh$Da85emvIy-o)8A~$>uzhkQC=(YfCpUtoa!>4a*MS-BhvU&8Ng(?AdKBo; z9QvJXr=Qc7(d~Y}DU~|8KDKMU^f4p=6@`P=j;QR+93_v-bP5#D*C8&#jPjAVDj1}= zxt-Z7*UWpzr$rtEGsMMjDVMWN2$2ZIN$_lKE-vn@n!SIP;0cQg{rbnE!-a6|*2-ZI zhL)4P0300ABZ~q!IAR<}*xIuzjgMeaWPYo=M+Mm#BmnEXEtLsa+KS`DR>^h%&QiwZ zkoBdH3340^^=J3V<$&2WwNd(z%r6Gd7A)!tbdL^x_pflS`EV2c4)zdj<#OZ=edGC8 zqSNIPm4fD`(+POsT3jk&^gO?Ff{;_Iu?et;Av z^W*RrA5|?7QsI#7jHGq(YSqK=cEoM4Y_&;o4ir~8VxGLbUwNYHcZ9&>Sxk-{q7{c0{Cx0Zf(KKom6xTgRd*2P>r?&SgW2^L_aFw?z(I=C_c z%8ZK#g<#f9Cedx~_ZE7=zpFDn>|C&ewc zY$I25b@w1?wO%*iMx?n_icn=|(LSPCxg6xuKe^C2PgY$e0Zag?fgB)kxYM+{ul)+0 zYmoVomQ&~x?uk;9^@V4(19S;G4Vcl`aDngeL}N34>&*cjkaKevcLBgaS1QGMYA%GB zX+B+Fl5off+!aKL**hw$3s;CGHrsClDhbRF4M>iNdkS?W3DLH8F<7z#k~nFO%uhm} z8bveehxWtV4xcsXeg>W=sFb=6Uf#e}2SOxi!4XUL(}XZ1HE^FmYMAQM2FIA+Q+S&- zR5(}q%p+J786|bQZNLQ3BeTB{y5*Y?qB4QnDE(Jf;Hm@PYVAlInth=3nUE0CQe({4}ZI!OW>U)~U#V6WN_h7X#vVM>fX;cb9h zwU|#9h3AFuUd9lTOR|e5LMojm86s`08x{i5X_=;`kLl(6`mD$5b;B?;O=J3K#B}wA Yfc|T5gdcsx7-nc%{a*D&;d}r7A5W=Vk^lez diff --git a/Shared/Resources/notificationSoundBlip.mp3 b/Shared/Resources/notificationSoundBlip.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..f22ba4752ee2dc90386c9c2a62535024234cad33 GIT binary patch literal 1902 zcmezWd%_V0bP$o5mkt!;2V!<0%44WS0drBnW)yG=72H7q?@+*h6acg)hAB+wDF+XM#Ff*H|>CBwaV=#~X ziZVkd^HPT6+`ejE3U`zy2}C$JY`yR_v_r?)-K5y{!l~{l9oc;gi@9gaR9ZAqoU@>< zFaN~Ki4}XcL}py;fAaFsr!vj@e_d*tDsiqt@Bg@nvbs11@BbMn5F#qb>KMx0z#zlN z#K8Ff|CN0u(~Q?_>0vmKabOD<508_^VOxbBbH)V+ZCHDl95nR~?U7v+>2C--(V3H?qLr(dPvuE-Z3^tzLZB3($pCCCAcxR-mF`s7ra}F)Ba-6 z@sAd#>VJt!pK*|XzX539nUx+4iyk*fMC7^j)hTu<&ipoE<*tVu8Z|s@7Xphc3ORmG z-?XVty0pH2<-@`H@>z+>5o#oF!eS`3W#c1o6*Vac~xs za8q;B*EQ}+(o@3u{{OoXVHv{wjlqJCk%95!8`p+Cr-PQZiZK*6dYs=Qak${a1m^Vq zJ@y=nH`)LHyhKN~{;z_t-vTWL3*r1#?#xUq&DLzgX$gPbm^1eF-`L={!lS^1 zm)UXs29r>DF%e2FK#Ga~e=8jM)9Aqws=lUFYr&bWCx7{6o>0pnM41C}!B2)`SHjgF zlq_DbwCl+QzA2?d>7(^b literal 0 HcmV?d00001 diff --git a/iOS/AppAssets.swift b/iOS/AppAssets.swift index 8a3f89746..9c7faca3d 100644 --- a/iOS/AppAssets.swift +++ b/iOS/AppAssets.swift @@ -327,7 +327,7 @@ struct AppAssets { static var notificationSoundBlipFileName: String = { // https://freesound.org/people/cabled_mess/sounds/350862/ - return "notificationSoundBlip.caf" + return "notificationSoundBlip.mp3" }() }