From d6af4075817e3e610415d80fb267b308826964b2 Mon Sep 17 00:00:00 2001 From: Edouard Griffiths Date: Tue, 10 Dec 2024 21:46:57 +0100 Subject: [PATCH] Revert "Fix audio modulators when channel sample rate is greater than audio sample rate" --- plugins/channelrx/demodadsb/flags.qrc | 2 +- .../flags/{kazakhstan.bmp => khazakstan.bmp} | Bin .../demodadsb/flags/regprefixmap.csv | 2 +- plugins/channelrx/demoddsc/coaststations.cpp | 57 +----------------- plugins/channelrx/demoddsc/dscdemodgui.cpp | 3 - plugins/channeltx/modam/ammodsource.cpp | 2 +- plugins/channeltx/modnfm/nfmmodsource.cpp | 2 +- plugins/channeltx/modssb/ssbmodsource.cpp | 2 +- plugins/channeltx/modwfm/wfmmodsource.cpp | 2 +- 9 files changed, 7 insertions(+), 65 deletions(-) rename plugins/channelrx/demodadsb/flags/{kazakhstan.bmp => khazakstan.bmp} (100%) diff --git a/plugins/channelrx/demodadsb/flags.qrc b/plugins/channelrx/demodadsb/flags.qrc index 0dcf50d6f..3c9d5dab4 100644 --- a/plugins/channelrx/demodadsb/flags.qrc +++ b/plugins/channelrx/demodadsb/flags.qrc @@ -205,7 +205,7 @@ flags/kazakhstan_mil.bmp flags/kenya.bmp flags/kenya_mil.bmp - flags/kazakhstan.bmp + flags/khazakstan.bmp flags/kiribati.bmp flags/korea_north.bmp flags/korea_north_mil.bmp diff --git a/plugins/channelrx/demodadsb/flags/kazakhstan.bmp b/plugins/channelrx/demodadsb/flags/khazakstan.bmp similarity index 100% rename from plugins/channelrx/demodadsb/flags/kazakhstan.bmp rename to plugins/channelrx/demodadsb/flags/khazakstan.bmp diff --git a/plugins/channelrx/demodadsb/flags/regprefixmap.csv b/plugins/channelrx/demodadsb/flags/regprefixmap.csv index d86f9aa6b..24cec7561 100644 --- a/plugins/channelrx/demodadsb/flags/regprefixmap.csv +++ b/plugins/channelrx/demodadsb/flags/regprefixmap.csv @@ -105,7 +105,7 @@ JA,japan ZJ,jersey JY,jordan 5Y,kenya -UP,kazakhstan +UP,khazakstan T3,kiribati P,korea_north HL,korea-south diff --git a/plugins/channelrx/demoddsc/coaststations.cpp b/plugins/channelrx/demoddsc/coaststations.cpp index 992f9deb4..4d8b99c9a 100644 --- a/plugins/channelrx/demoddsc/coaststations.cpp +++ b/plugins/channelrx/demoddsc/coaststations.cpp @@ -35,7 +35,6 @@ const QMap CoastStations { {"002711000", "AKDAG RADIO"}, {"004030000", "AL BIRK RADIO"}, {"004030000", "AL LITH RADIO"}, - {"004030000", "AL QUNFUDHAH RADIO"}, {"004030000", "AL WAJH RADIO"}, {"006221111", "ALEXANDRIA RADIO"}, {"006052110", "ALGER RADIO"}, @@ -50,8 +49,6 @@ const QMap CoastStations { {"002713000", "ANTALYA TURK RADIO"}, {"007250050", "ANTOFAGASTA ZONAL RADIO"}, {"002050485", "ANTWERPEN RADIO"}, - {"004224500", "ANZALI RADIO"}, - {"004225500", "ANZALI RADIO"}, {"004381234", "AQABA COASTAL RADIO STATION/JYO - AQABA PORT CONTROL/JYP"}, {"002633000", "ARGA"}, {"007010111", "ARGENTINA RADIO"}, @@ -67,7 +64,6 @@ const QMap CoastStations { {"002470120", "AUGUSTA RADIO"}, {"002711000", "AYVALIK RADIO"}, {"005743040", "BAC LIEU RADIO"}, - {"005741050", "BACH LONG VY RADIO"}, {"007250370", "BAHIA FELIX RADIO"}, {"007250450", "BAHIA FILDES RADIO"}, {"007250470", "BAHIA PARAISO RADIO"}, @@ -91,7 +87,6 @@ const QMap CoastStations { {"002620002", "BAR RADIO"}, {"002620003", "BAR RADIO"}, {"002470121", "BARI RADIO"}, - {"004123600", "BASUO RADIO"}, {"005250012", "BATU AMPAR RADIO"}, {"005251526", "BAU-BAU RADIO"}, {"004123400", "BEIHAI RADIO"}, @@ -106,7 +101,6 @@ const QMap CoastStations { {"005250031", "BIAK RADIO / PKY2"}, {"005251516", "BIMA RADIO"}, {"005250026", "BINTUNI RADIO"}, - {"005250005", "BITUNG RADIO / PKM"}, {"002713000", "BODRUM RADIO"}, {"005250089", "BONTANG RADIO"}, {"002470094", "BOSA"}, @@ -121,7 +115,6 @@ const QMap CoastStations { {"005330185", "BUKIT KELAPA"}, {"005330013", "BUKIT KERATONG"}, {"005330186", "BUKIT LIMA"}, - {"005330012", "BUKIT NYABAU"}, {"004402101", "BUSAN/SUHYUP"}, {"004402107", "BUSAN/SUHYUP"}, {"004402111", "BUSAN/SUHYUP"}, @@ -140,7 +133,6 @@ const QMap CoastStations { {"002633020", "CANDEEIROS"}, {"004121203", "CANGZHOU"}, {"004121202", "CAO FEI DIAN"}, - {"006010001", "CAPE TOWN RADIO"}, {"007250250", "CASTRO RADIO"}, {"002470095", "CESENATICO"}, {"004224401", "CHABAHAR RADIO"}, @@ -156,7 +148,6 @@ const QMap CoastStations { {"005250089", "CILACAP RADIO / PKR6"}, {"005250032", "CIREBON RADIO"}, {"003450710", "CIUDAD DEL CARMEN, CAMPECHE RADIO"}, - {"002470123", "CIVITAVECCHIA RADIO"}, {"003621111", "COAST GUARD CONTROL"}, {"003621112", "COAST GUARD CONTROL"}, {"003621113", "COAST GUARD CONTROL"}, @@ -178,7 +169,6 @@ const QMap CoastStations { {"005741020", "CUA ONG RADIO"}, {"005742010", "CUA VIET RADIO"}, {"002091000", "CYPRUS RADIO"}, - {"005742030", "DA NANG RADIO"}, {"005251559", "DABO SINGKEP RADIO"}, {"004121300", "DALIAN RADIO"}, {"004030000", "DAMMAM RADIO"}, @@ -196,7 +186,6 @@ const QMap CoastStations { {"002733717", "DIKSON TAO"}, {"002713000", "DILEKTEPE RADIO"}, {"006211000", "DJIBOUTI RADIO"}, - {"004661010", "DOHA RADIO"}, {"004121402", "DONG YING RADIO"}, {"004402606", "DONGHAE/SUHYUP"}, {"004402607", "DONGHAE/SUHYUP"}, @@ -212,7 +201,6 @@ const QMap CoastStations { {"007300501", "ECTVM - CARTAGENA - CP05"}, {"007300901", "ECTVM - COVEŅAS - CP09"}, {"007300401", "ECTVM - SANTA MARTA - CP04"}, - {"007300201", "ECTVM - TUMACO - CP02"}, {"007300801", "ECTVM - TURBO - CP08"}, {"004700000", "EMIRATES RADIO"}, {"004701001", "EMIRATES RESCUE (JRCCAD)"}, @@ -227,7 +215,6 @@ const QMap CoastStations { {"007250410", "FARO ESPIRITU SANTO RADIO"}, {"007250350", "FARO EVANGELISTAS RADIO"}, {"007250360", "FARO FAIRWAY RADIO"}, - {"007250290", "FARO GUAFO RADIO"}, {"007250310", "FARO RAPER RADIO"}, {"002633090", "FIGUEIRA DA FOZ"}, {"002241022", "FINISTERRE RADIO"}, @@ -244,7 +231,6 @@ const QMap CoastStations { {"002734468", "GORKI LEN"}, {"002733700", "GORKI LEN"}, {"006191000", "GRAND LAHOU RADIO"}, - {"004123100", "GUANGZHOU RADIO"}, {"007354750", "GUAYAQUIL RADIO"}, {"004400201", "GUNSAN RADIO"}, {"004400501", "GUNSAN RADIO"}, @@ -264,7 +250,6 @@ const QMap CoastStations { {"004030000", "HMB (AZIZYA) RADIO"}, {"005743030", "HO CHI MINH RADIO"}, {"004310101", "HOKKAIDO COAST GUARD RADIO"}, - {"002320018", "HOLYHEAD"}, {"005741030", "HON GAI RADIO"}, {"005741080", "HON LA RADIO"}, {"003669993", "HONOLULU"}, @@ -284,7 +269,6 @@ const QMap CoastStations { {"002712000", "INEBOLU RADIO"}, {"003160023", "IQALUIT COAST GUARD RADIO"}, {"007250020", "IQUIQUE RADIO"}, - {"007600133", "IQUITOS RADIO"}, {"002510100", "ISAFJOERDUR RADIO"}, {"002711000", "ISTANBUL TURK RADIO"}, {"002715000", "IZMIR TURK RADIO"}, @@ -303,7 +287,6 @@ const QMap CoastStations { {"005251583", "JEPARA RADIO"}, {"002470096", "JESOLO"}, {"004126620", "JIANGYIN RADIO"}, - {"004030000", "JIZAN RADIO"}, {"005030001", "JRCC AUSTRALIA"}, {"003061000", "JRCC CURACAO/DUTCH CARIBBEAN COAST GUARD"}, {"002653000", "JRCC SWEDEN"}, @@ -322,7 +305,6 @@ const QMap CoastStations { {"005251582", "KARIMUNJAWA RADIO"}, {"002711000", "KARTEPE RADIO"}, {"002711000", "KAYALIDAG RADIO"}, - {"002713000", "KAZAKIN RADIO"}, {"005330008", "KEMUNING"}, {"005250019", "KENDARI RADIO / PKF3"}, {"005251503", "KETAPANG RADIO"}, @@ -338,7 +320,6 @@ const QMap CoastStations { {"004224303", "KISH RADIO"}, {"002770330", "KLAIPEDA RESCUE RADIO"}, {"004310501", "KOBE COAST GUARD RADIO"}, - {"003669899", "KODIAK RADIO"}, {"005251575", "KOLAKA RADIO"}, {"006221112", "KOSSEIR RADIO"}, {"006191000", "KOUAKRO RADIO"}, @@ -353,8 +334,6 @@ const QMap CoastStations { {"002470126", "LAMPEDUSA RADIO"}, {"002241026", "LAS PALMAS RADIO"}, {"004680011", "LATTAKIA RADIO"}, - {"004224204", "LAVAR RADIO"}, - {"004225204", "LAVAR RADIO"}, {"003451610", "LAZARO CARDENAS, MICHOACAN RADIO"}, {"005250022", "LEMBAR RADIO / PKD3"}, {"004224302", "LENGEH RADIO"}, @@ -369,7 +348,6 @@ const QMap CoastStations { {"005742050", "LY SON RADIO"}, {"002191000", "LYNGBY RADIO"}, {"002241022", "MACHICHACO RADIO"}, - {"002712000", "MACKA R/L"}, {"002241022", "MADRID RADIO"}, {"002734416", "MAGADAN 4"}, {"007250380", "MAGALLANES ZONAL RADIO"}, @@ -385,7 +363,6 @@ const QMap CoastStations { {"007354754", "MANTA RADIO"}, {"003451410", "MANZANILLO, COLIMA RADIO"}, {"007010003", "MAR DEL PLATA PREFECTURA NAVAL RADIO"}, - {"007010221", "MAR DEL PLATA RADIO"}, {"002723650", "MARIUPOL RSC"}, {"002713000", "MARKIZ RADIO"}, {"005251518", "MAUMERE RADIO"}, @@ -400,7 +377,6 @@ const QMap CoastStations { {"002470129", "MESSINA RADIO"}, {"002320017", "MILFORD HAVEN"}, {"003660003", "MOBILE, ALABAMA RADIO / WLO"}, - {"004310701", "MOJI COAST GUARD RADIO"}, {"004400304", "MOKPO RADIO"}, {"004400307", "MOKPO RADIO"}, {"004400308", "MOKPO RADIO"}, @@ -428,7 +404,6 @@ const QMap CoastStations { {"002275000", "MRCC ETEL"}, {"002275010", "MRCC ETEL"}, {"002130100", "MRCC GEORGIA"}, - {"002275100", "MRCC GRIS-NEZ"}, {"004773500", "MRCC HONG KONG"}, {"002275200", "MRCC JOBOURG"}, {"002275400", "MRCC LA GARDE"}, @@ -445,7 +420,6 @@ const QMap CoastStations { {"002301000", "MRCC TURKU"}, {"002050480", "MRCC-OOSTENDE RADIO"}, {"002059981", "MRCC-OOSTENDE RADIO"}, - {"002275420", "MRSC AJACCIO"}, {"002470017", "MRSC ANCONA"}, {"004192209", "MRSC ANDROTH"}, {"002470016", "MRSC BARI"}, @@ -460,7 +434,6 @@ const QMap CoastStations { {"002470011", "MRSC GENOVA"}, {"004192206", "MRSC GOA"}, {"004194403", "MRSC GOPALPUR"}, - {"004194404", "MRSC HALDIA"}, {"002302000", "MRSC HELSINKI"}, {"004194409", "MRSC HUTBAY"}, {"004192208", "MRSC JAKHAU"}, @@ -475,7 +448,6 @@ const QMap CoastStations { {"002500100", "MRSC MALIN HEAD RADIO"}, {"004194406", "MRSC MANDAPAM"}, {"004194407", "MRSC MAYABUNDAR"}, - {"004192209", "MRSC MINICOY"}, {"004192207", "MRSC MUNDRA"}, {"004192203", "MRSC MURUD JANJIRA"}, {"002470014", "MRSC NAPOLI"}, @@ -490,7 +462,6 @@ const QMap CoastStations { {"004192203", "MRSC RATNAGIRI"}, {"002470018", "MRSC RAVENNA"}, {"002470015", "MRSC REGGIO CALABRIA"}, - {"002470013", "MRSC ROMA"}, {"002470020", "MRSC TRIESTE"}, {"004194405", "MRSC TUTICORIN"}, {"004192210", "MRSC VADINAR"}, @@ -505,7 +476,6 @@ const QMap CoastStations { {"005060200", "MYEIK RADIO"}, {"004310401", "NAGOYA COAST GUARD RADIO"}, {"002470130", "NAPOLI RADIO"}, - {"002500300", "NATIONAL MARITIME OPERATIONS CENTRE (MRCC DUBLIN)"}, {"005251505", "NATUNA RADIO"}, {"006459022", "NCG"}, {"004224602", "NEKA RADIO"}, @@ -521,8 +491,6 @@ const QMap CoastStations { {"002570000", "NORWEGIAN COASTAL RADIO, SOUTH"}, {"002731223", "NOVAYA ZEMLYA ARKH/NOVAYA ZEMLYA-RADIO"}, {"002734411", "NOVOROSSIYSK RADIO MRCC/NOVOROSSIYSK-RADIO-SKC"}, - {"004224600", "NOWSHAHR RADIO"}, - {"004225600", "NOWSHAHR RADIO"}, {"004030000", "OBHUR RADIO"}, {"002723660", "ODESSA MRCC"}, {"004311101", "OKINAWA COAST GUARD RADIO"}, @@ -537,7 +505,6 @@ const QMap CoastStations { {"007600121", "PAITA RADIO"}, {"002713000", "PALAMUT RADIO"}, {"005251507", "PALEMBANG RADIO"}, - {"002470002", "PALERMO RADIO"}, {"002241024", "PALMA RADIO"}, {"005250071", "PALOPO RADIO"}, {"005251508", "PANGKAL BALAM RADIO"}, @@ -553,7 +520,6 @@ const QMap CoastStations { {"002733730", "PEVEK CHAO"}, {"005742100", "PHAN RANG RADIO"}, {"005743010", "PHAN THIET RADIO"}, - {"005743110", "PHU QUOC RADIO"}, {"005742070", "PHU YEN RADIO"}, {"002633040", "PICOTO"}, {"007600123", "PIMENTEL RADIO"}, @@ -570,7 +536,6 @@ const QMap CoastStations { {"002618102", "POLISH RESCUE RADIO"}, {"002633100", "PONTA DO ALTAR"}, {"005250016", "PONTIANAK RADIO / PKS"}, - {"003160018", "PORT AUX BASQUES COAST GUARD RADIO"}, {"004702007", "PORT OF FUJAIRAH"}, {"004702008", "PORT OF FUJAIRAH"}, {"006221113", "PORT SAID RADIO"}, @@ -586,7 +551,6 @@ const QMap CoastStations { {"007354757", "PUERTO AYORA RADIO"}, {"007250300", "PUERTO AYSEN RADIO"}, {"007354756", "PUERTO BOLIVAR RADIO"}, - {"007250298", "PUERTO CHACABUCO RADIO"}, {"007250330", "PUERTO EDEN RADIO"}, {"007250230", "PUERTO MONTT ZONAL RADIO"}, {"007250340", "PUERTO NATALES RADIO"}, @@ -606,7 +570,6 @@ const QMap CoastStations { {"007250270", "QUELLON RADIO"}, {"004224304", "QUESHM RADIO"}, {"007250125", "QUINTERO RADIO"}, - {"005742060", "QUY NHON RADIO"}, {"004030000", "RABIGH RADIO"}, {"002733728", "RADUZHNYY MAGADAN"}, {"003669991", "RCC BOSTON"}, @@ -621,7 +584,6 @@ const QMap CoastStations { {"007100002", "RECIFE BONGI"}, {"002510100", "REYKJAVIK RADIO"}, {"004122201", "RI ZHAO"}, - {"002750100", "RIGA RESCUE RADIO"}, {"002380200", "RIJEKA RADIO"}, {"007100001", "RIO DE JANEIRO (SANTA CRUZ)"}, {"007010010", "RIO GALLEGOS PREFECTURA NAVAL RADIO"}, @@ -638,7 +600,6 @@ const QMap CoastStations { {"002731187", "SABETTA PT YNAO"}, {"002731197", "SABETTA PT YNAO"}, {"002733733", "SAKHALIN RADIO SPC"}, - {"007600124", "SALAVERRY RADIO"}, {"007354755", "SALINAS RADIO"}, {"005251524", "SAMARINDA RADIO / PKN6"}, {"004402106", "SAMCHEONPO/SUHYUP"}, @@ -654,7 +615,6 @@ const QMap CoastStations { {"003160030", "SARNIA COAST GUARD RADIO"}, {"006191000", "SASSANDRA RADIO"}, {"005251531", "SAUMLAKI RADIO"}, - {"005250029", "SEI KOLAK KIJANG RADIO"}, {"005250090", "SEI PAKNING RADIO"}, {"005250008", "SEMARANG RADIO / PKR"}, {"004400002", "SEOUL RADIO"}, @@ -669,7 +629,6 @@ const QMap CoastStations { {"002510100", "SIGLUFJOERDUR RADIO"}, {"005630002", "SINGAPORE PORT OPERATIONS CONTROL"}, {"002734417", "SINYAVINO KLN/KALININGRAD-1"}, - {"005250047", "SIPORA RADIO"}, {"002731108", "SOCHI AKHUN MTN KRAS"}, {"004402603", "SOKCHO/SUHYUP"}, {"002320011", "SOLENT"}, @@ -684,7 +643,6 @@ const QMap CoastStations { {"005330200", "STESEN PENERIMAAN SEMANTAN"}, {"005330198", "STESEN SATELLITE BUMI BESERAH"}, {"002320024", "STORNOWAY"}, - {"007600127", "SUPE RADIO"}, {"005250001", "SURABAYA RADIO / PKD"}, {"002733733", "SVOBODNYY SAKH"}, {"003160017", "SYDNEY COAST GUARD RADIO"}, @@ -701,7 +659,6 @@ const QMap CoastStations { {"002761000", "TALLINN RADIO"}, {"007250060", "TALTAL RADIO"}, {"003450110", "TAMPICO, TAMAULIPAS RADIO"}, - {"005330187", "TANJUNG LOBANG"}, {"005251506", "TANJUNG UBAN RADIO / PKJ"}, {"005251502", "TAPAK TUAN RADIO"}, {"005250017", "TARAKAN RADIO / PKO"}, @@ -716,7 +673,6 @@ const QMap CoastStations { {"005250020", "TERNATE RADIO / PKE5"}, {"002470099", "TERRASINI"}, {"005330014", "TG TARAS"}, - {"005741060", "THANH HOA RADIO"}, {"005743100", "THO CHU RADIO"}, {"004121100", "TIANJIN RADIO"}, {"002734449", "TIKSI MRSC"}, @@ -735,7 +691,6 @@ const QMap CoastStations { {"005330194", "TRIG HILL"}, {"005251530", "TUAL RADIO"}, {"002734413", "TUAPSE KRAS/TUAPSE-CENTR"}, - {"002300230", "TURKU RADIO"}, {"002734448", "UGOLNYE KOPI 3-Y CHAO/MARIYA-RADIO"}, {"002731178", "UGOLNYE KOPI CHAO"}, {"004402404", "ULLENG/SUHYUP"}, @@ -748,7 +703,7 @@ const QMap CoastStations { {"004402104", "ULSAN/SUHYUP"}, {"005330004", "ULU KALI"}, {"004030000", "UMM LAJJ RADIO"}, - {"007250220", "VALDIVIA RADIO"}, + {"007250220", "VALDIVIA DOVRADIO"}, {"007251860", "VALPARAISO PLAYA ANCHA RADIO"}, {"002734421", "VANINO RADIO"}, {"002070810", "VARNA RADIO"}, @@ -758,7 +713,6 @@ const QMap CoastStations { {"002770110", "VESSEL TRAFFIC MONITORING"}, {"002770120", "VESSEL TRAFFIC MONITORING"}, {"002770130", "VESSEL TRAFFIC MONITORING"}, - {"002510100", "VESTMANNAEYJAR RADIO"}, {"002633070", "VIANA DO CASTELO"}, {"003160011", "VICTORIA COAST GUARD RADIO"}, {"002734412", "VLADIVOSTOCK RADIO MRCC"}, @@ -775,8 +729,6 @@ const QMap CoastStations { {"004030000", "YANBU RADIO"}, {"005060100", "YANGON RADIO"}, {"004121400", "YANTAI RADIO"}, - {"004400305", "YEOSU RADIO"}, - {"004400306", "YEOSU RADIO"}, {"004402303", "YEOSU/SUHYUP"}, {"004402304", "YEOSU/SUHYUP"}, {"004402307", "YEOSU/SUHYUP"}, @@ -788,11 +740,4 @@ const QMap CoastStations { {"004123300", "ZHANJIANG RADIO"}, {"004125725", "ZHANJIANG RADIO"}, {"002712000", "ZONGULDAK RADIO"}, - {"007600120", "ZORRITOS RADIO"}, - // Not from ITU database - {"004472188", "KUWAIT"}, - {"002241078", "MADRID RADIO"}, - {"002640570", "CONSTANTA RADIO"}, - {"004280001", "HAIFA RADIO"}, - {"004634060", "MRCC KARACHI"} }; diff --git a/plugins/channelrx/demoddsc/dscdemodgui.cpp b/plugins/channelrx/demoddsc/dscdemodgui.cpp index 3fc540624..b09f60397 100644 --- a/plugins/channelrx/demoddsc/dscdemodgui.cpp +++ b/plugins/channelrx/demoddsc/dscdemodgui.cpp @@ -329,9 +329,6 @@ void DSCDemodGUI::messageReceived(const DSCMessage& message, int errors, float r if (CoastStations.contains(message.m_address)) { addressNameItem->setText(CoastStations.value(message.m_address)); } - if (CoastStations.contains(message.m_selfId)) { - selfIdNameItem->setText(CoastStations.value(message.m_selfId)); - } // Get latest APRS.fi data to calculate distance if (m_aprsFi && message.m_valid) diff --git a/plugins/channeltx/modam/ammodsource.cpp b/plugins/channeltx/modam/ammodsource.cpp index 165a2f426..602890269 100644 --- a/plugins/channeltx/modam/ammodsource.cpp +++ b/plugins/channeltx/modam/ammodsource.cpp @@ -128,7 +128,7 @@ void AMModSource::pullOne(Sample& sample) void AMModSource::prefetch(unsigned int nbSamples) { - unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate)); + auto nbSamplesAudio = (nbSamples * (unsigned int) ((Real) m_audioSampleRate / (Real) m_channelSampleRate)); pullAudio(nbSamplesAudio); } diff --git a/plugins/channeltx/modnfm/nfmmodsource.cpp b/plugins/channeltx/modnfm/nfmmodsource.cpp index 7d54cb13f..ff37ccfb7 100644 --- a/plugins/channeltx/modnfm/nfmmodsource.cpp +++ b/plugins/channeltx/modnfm/nfmmodsource.cpp @@ -119,7 +119,7 @@ void NFMModSource::pullOne(Sample& sample) void NFMModSource::prefetch(unsigned int nbSamples) { - unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate)); + unsigned int nbSamplesAudio = (nbSamples * (unsigned int) ((Real) m_audioSampleRate / (Real) m_channelSampleRate)); pullAudio(nbSamplesAudio); } diff --git a/plugins/channeltx/modssb/ssbmodsource.cpp b/plugins/channeltx/modssb/ssbmodsource.cpp index 3d7e2483b..c2e1f9df2 100644 --- a/plugins/channeltx/modssb/ssbmodsource.cpp +++ b/plugins/channeltx/modssb/ssbmodsource.cpp @@ -131,7 +131,7 @@ void SSBModSource::pullOne(Sample& sample) void SSBModSource::prefetch(unsigned int nbSamples) { - unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate)); + unsigned int nbSamplesAudio = (nbSamples * (unsigned int) ((Real) m_audioSampleRate / (Real) m_channelSampleRate)); pullAudio(nbSamplesAudio); } diff --git a/plugins/channeltx/modwfm/wfmmodsource.cpp b/plugins/channeltx/modwfm/wfmmodsource.cpp index 2b01569d4..532ccf594 100644 --- a/plugins/channeltx/modwfm/wfmmodsource.cpp +++ b/plugins/channeltx/modwfm/wfmmodsource.cpp @@ -191,7 +191,7 @@ void WFMModSource::modulateAudio() void WFMModSource::prefetch(unsigned int nbSamples) { - unsigned int nbSamplesAudio = (unsigned int) (nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate)); + unsigned int nbSamplesAudio = nbSamples * ((Real) m_audioSampleRate / (Real) m_channelSampleRate); pullAudio(nbSamplesAudio); }