<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/54f5eff270cb549ac9c796d1f667ac525fa7d913">https://github.com/macports/macports-ports/commit/54f5eff270cb549ac9c796d1f667ac525fa7d913</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 54f5eff270cb549ac9c796d1f667ac525fa7d913
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Wed Aug 10 11:00:23 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> pihpsdr: update commit to a415f5ca
</span>---
science/pihpsdr/Portfile | 13 +-
...dd-remote-audio-output-option-for-each-RX.patch | 137 ---------------------
2 files changed, 5 insertions(+), 145 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pihpsdr/Portfile b/science/pihpsdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63a6ac77e48..a122572a4bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pihpsdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/pihpsdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,16 +16,13 @@ maintainers {ra1nb0w @ra1nb0w} openmaintainer
</span> description piHPSDR is an HPSDR application designed for low power boards, like Raspberry.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup dl1ycf pihpsdr 269455d8ad243678f2a09d7c2030aefca9549232
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20220422-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dc69557861df201fa7956ae5e135af7c52e8dcb5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e8043acbf9bfc360bc03c56bc8a0ce4eb43614cc592db4a6328293c6b8c2dc0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 119398866
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dl1ycf pihpsdr a415f5ca4ca75c9dbd0d549c96ca26b374902ae1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20220806-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bdea9c807a2026a638487bb91005995d707db103 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ace561997573be973b0eacac4d9a1af676bc88f76c5b1dc1c34b1ac6aaea91df \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 119402294
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0001-add-remote-audio-output-option-for-each-RX.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.c_standard 1999
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/pihpsdr/files/0001-add-remote-audio-output-option-for-each-RX.patch b/science/pihpsdr/files/0001-add-remote-audio-output-option-for-each-RX.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 33c927ab97d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/pihpsdr/files/0001-add-remote-audio-output-option-for-each-RX.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,137 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 67e0bc16ca6f4c1f8b3af0a8ef8da1ee5076ea8c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Davide Gerhard <rainbow@irh.it>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 3 May 2021 08:51:54 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] add remote audio output option for each RX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-we can enable or disable the remote audio output for each receiver.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The audio volume remains the same for local and remote audio.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- receiver.c | 14 +++++++++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- receiver.h | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx_menu.c | 18 +++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 30 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git receiver.c receiver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0ac4b10..c4058de 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- receiver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ receiver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,6 +198,9 @@ void receiver_save_state(RECEIVER *rx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(name,"receiver.%d.audio_channel",rx->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(value,"%d",rx->audio_channel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setProperty(name,value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sprintf(name,"receiver.%d.remote_audio",rx->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sprintf(value,"%d",rx->remote_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setProperty(name,value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(name,"receiver.%d.local_audio",rx->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(value,"%d",rx->local_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setProperty(name,value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -372,6 +375,9 @@ g_print("%s: id=%d\n",__FUNCTION__,rx->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(name,"receiver.%d.audio_channel",rx->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value=getProperty(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(value) rx->audio_channel=atoi(value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sprintf(name,"receiver.%d.remote_audio",rx->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value=getProperty(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(value) rx->remote_audio=atoi(value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(name,"receiver.%d.local_audio",rx->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value=getProperty(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(value) rx->local_audio=atoi(value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -936,6 +942,7 @@ g_print("%s: id=%d buffer_size=%d\n",__FUNCTION__,id,buffer_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->audio_channel=STEREO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->audio_device=-1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->mute_radio=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rx->remote_audio=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->low_latency=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1068,6 +1075,7 @@ g_print("%s: id=%d sample_rate=%d\n",__FUNCTION__,rx->id, rx->sample_rate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->mute_when_not_active=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->audio_channel=STEREO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->audio_device=-1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rx->remote_audio=1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->low_latency=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1096,7 +1104,7 @@ g_print("%s: id=%d sample_rate=%d\n",__FUNCTION__,rx->id, rx->sample_rate);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->pixel_samples=g_new(float,rx->pixels);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--g_print("%s (after restore): rx=%p id=%d audio_buffer_size=%d local_audio=%d\n",__FUNCTION__,rx,rx->id,rx->audio_buffer_size,rx->local_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+g_print("%s (after restore): rx=%p id=%d audio_buffer_size=%d local_audio=%d remote_audio=%d\n",__FUNCTION__,rx,rx->id,rx->audio_buffer_size,rx->local_audio,rx->remote_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int scale=rx->sample_rate/48000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->output_samples=rx->buffer_size/scale;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rx->audio_output_buffer=g_new(gdouble,2*rx->output_samples);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1403,7 +1411,7 @@ static void process_rx_buffer(RECEIVER *rx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(rx->mute_radio) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- old_protocol_audio_samples(rx,(short)0,(short)0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- old_protocol_audio_samples(rx,left_audio_sample,right_audio_sample);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ old_protocol_audio_samples(rx, rx->remote_audio ? left_audio_sample : (short)0, rx->remote_audio ? right_audio_sample : (short)0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case NEW_PROTOCOL:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1411,7 +1419,7 @@ static void process_rx_buffer(RECEIVER *rx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(rx->mute_radio) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new_protocol_audio_samples(rx,(short)0,(short)0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- new_protocol_audio_samples(rx,left_audio_sample,right_audio_sample);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ new_protocol_audio_samples(rx, rx->remote_audio ? left_audio_sample : (short)0, rx->remote_audio ? right_audio_sample : (short)0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git receiver.h receiver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 93aee97..d3cc56c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- receiver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ receiver.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,6 +142,8 @@ typedef struct _receiver {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint local_audio_buffer_offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GMutex local_audio_mutex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gboolean remote_audio;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint low_latency;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint squelch_enable;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git rx_menu.c rx_menu.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b47ef25..858c739 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rx_menu.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rx_menu.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,7 @@ static GtkWidget *menu_b=NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static GtkWidget *dialog=NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static GtkWidget *local_audio_b=NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static GtkWidget *output=NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static GtkWidget *remote_audio_b=NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void cleanup() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(dialog!=NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,6 +128,11 @@ fprintf(stderr,"local_audio_cb: audio_open_output failed\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr,"local_audio_cb: local_audio=%d\n",active_receiver->local_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static void remote_audio_cb(GtkWidget *widget, gpointer data) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr,"remote_audio_cb: rx=%d\n",active_receiver->id);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ active_receiver->remote_audio=gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void mute_audio_cb(GtkWidget *widget, gpointer data) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- active_receiver->mute_when_not_active=gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -356,8 +362,18 @@ void rx_menu(GtkWidget *parent) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int row=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // radio that don't have remote audio codec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // should not visualize the option
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (radio->device != DEVICE_HERMES_LITE2) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ remote_audio_b=gtk_check_button_new_with_label("Remote Audio Output");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (remote_audio_b), active_receiver->remote_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_widget_show(remote_audio_b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_grid_attach(GTK_GRID(grid),remote_audio_b,x,++row,1,1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_signal_connect(remote_audio_b,"toggled",G_CALLBACK(remote_audio_cb),NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(n_output_devices>0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- local_audio_b=gtk_check_button_new_with_label("Local Audio Output");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (local_audio_b), active_receiver->local_audio);
</span></pre><pre style='margin:0'>
</pre>