<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/e137facf5e177fb740fd947b7f6c29a746c75b0d">https://github.com/macports/macports-ports/commit/e137facf5e177fb740fd947b7f6c29a746c75b0d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e137facf5e1 pihpsdr: update commit to f878f7f4
</span>e137facf5e1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e137facf5e177fb740fd947b7f6c29a746c75b0d
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri May 28 15:42:13 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> pihpsdr: update commit to f878f7f4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> thanks ryandesign
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62979
</span>---
science/pihpsdr/Portfile | 12 +++----
...dd-remote-audio-output-option-for-each-RX.patch | 42 +++++++---------------
2 files changed, 19 insertions(+), 35 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 b030d18add4..0fac9ca757e 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,11 +16,11 @@ 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 02fe1bca9309f776c4f531fc4c90f2a930776fa2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210527-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7b4217caae5a88f1739f131b64aff472b0963872 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 332c9047a8990dd12347505fe7b7aada5b75f2bd9078568fe4483c9ad9415fce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 114592857
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup dl1ycf pihpsdr f878f7f4460d8be26493a00bcb5e656d8088958a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20210528-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 afedc2f446d7cbeba198c6554238ab40790fec8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0aa582aef4f2572b5dedd8f54f7aa64ba19a0cda56d33bcee13c95b238b9b914 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 114591906
</span> revision 0
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ depends_lib-append \
</span> port:curl
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#build.args-append -f Makefile.mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append GPIO_INCLUDE=
</span> makefile.override CFLAGS LDFLAGS
pre-configure {
<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><span style='display:block; white-space:pre;color:#808080;'>index 00010ccdac2..813985dc940 100644
</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;'>+++ b/science/pihpsdr/files/0001-add-remote-audio-output-option-for-each-RX.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 6c19dc85076cfbce3dc08262cf9fe785d932bfe6 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: Sat, 24 Apr 2021 18:45:26 +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> diff --git receiver.c receiver.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a073e71..b958bff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ac4b10..c4058de 100644
</span> --- receiver.c
+++ receiver.c
@@ -198,6 +198,9 @@ void receiver_save_state(RECEIVER *rx) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +12,7 @@ index a073e71..b958bff 100644
</span> sprintf(name,"receiver.%d.local_audio",rx->id);
sprintf(value,"%d",rx->local_audio);
setProperty(name,value);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -368,6 +371,9 @@ fprintf(stderr,"receiver_restore_state: id=%d\n",rx->id);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,6 +375,9 @@ g_print("%s: id=%d\n",__FUNCTION__,rx->id);
</span> sprintf(name,"receiver.%d.audio_channel",rx->id);
value=getProperty(name);
if(value) rx->audio_channel=atoi(value);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +22,7 @@ index a073e71..b958bff 100644
</span> sprintf(name,"receiver.%d.local_audio",rx->id);
value=getProperty(name);
if(value) rx->local_audio=atoi(value);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -935,6 +941,7 @@ fprintf(stderr,"create_pure_signal_receiver: id=%d buffer_size=%d\n",id,buffer_s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -936,6 +942,7 @@ g_print("%s: id=%d buffer_size=%d\n",__FUNCTION__,id,buffer_size);
</span> rx->audio_channel=STEREO;
rx->audio_device=-1;
rx->mute_radio=0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +30,7 @@ index a073e71..b958bff 100644
</span>
rx->low_latency=0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1068,6 +1075,7 @@ fprintf(stderr,"create_receiver: id=%d default adc=%d\n",rx->id, rx->adc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1068,6 +1075,7 @@ g_print("%s: id=%d sample_rate=%d\n",__FUNCTION__,rx->id, rx->sample_rate);
</span> rx->mute_when_not_active=0;
rx->audio_channel=STEREO;
rx->audio_device=-1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,16 +38,16 @@ index a073e71..b958bff 100644
</span>
rx->low_latency=0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1096,7 +1104,7 @@ fprintf(stderr,"create_receiver: id=%d default adc=%d\n",rx->id, rx->adc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1096,7 +1104,7 @@ g_print("%s: id=%d sample_rate=%d\n",__FUNCTION__,rx->id, rx->sample_rate);
</span> rx->pixel_samples=g_new(float,rx->pixels);
<span style='display:block; white-space:pre;background:#ffe0e0;'>--fprintf(stderr,"create_receiver (after restore): rx=%p id=%d audio_buffer_size=%d local_audio=%d\n",rx,rx->id,rx->audio_buffer_size,rx->local_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fprintf(stderr,"create_receiver (after restore): rx=%p id=%d audio_buffer_size=%d local_audio=%d remote_audio=%d\n",rx,rx->id,rx->audio_buffer_size,rx->local_audio,rx->remote_audio);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //rx->audio_buffer=g_new(guchar,rx->audio_buffer_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-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:#e0ffe0;'>++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> int scale=rx->sample_rate/48000;
rx->output_samples=rx->buffer_size/scale;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1406,7 +1414,7 @@ static void process_rx_buffer(RECEIVER *rx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rx->audio_output_buffer=g_new(gdouble,2*rx->output_samples);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1403,7 +1411,7 @@ static void process_rx_buffer(RECEIVER *rx) {
</span> if(rx->mute_radio) {
old_protocol_audio_samples(rx,(short)0,(short)0);
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +56,7 @@ index a073e71..b958bff 100644
</span> }
break;
case NEW_PROTOCOL:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1414,7 +1422,7 @@ static void process_rx_buffer(RECEIVER *rx) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1411,7 +1419,7 @@ static void process_rx_buffer(RECEIVER *rx) {
</span> if(rx->mute_radio) {
new_protocol_audio_samples(rx,(short)0,(short)0);
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,11 +66,11 @@ index a073e71..b958bff 100644
</span> }
break;
diff --git receiver.h receiver.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0551adc..76f0eda 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 93aee97..d3cc56c 100644
</span> --- receiver.h
+++ receiver.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,6 +131,8 @@ typedef struct _receiver {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *local_audio_buffer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,6 +142,8 @@ typedef struct _receiver {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gint local_audio_buffer_offset;
</span> GMutex local_audio_mutex;
+ gboolean remote_audio;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,6 +122,3 @@ index b47ef25..858c739 100644
</span> if(n_output_devices>0) {
local_audio_b=gtk_check_button_new_with_label("Local Audio Output");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (local_audio_b), active_receiver->local_audio);
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.31.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>