From f08be7db824cbac0a1aeafaac1f603a29d743c38 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 08:16:12 +0300
Subject: [PATCH 01/59] * Android: UI: popup suggestions where applicable
---
.../github/stsaz/phiola/ConvertActivity.java | 9 +++
.../com/github/stsaz/phiola/ExplorerMenu.java | 71 +++++++++++++++++++
.../github/stsaz/phiola/ListSaveActivity.java | 6 +-
.../github/stsaz/phiola/SettingsActivity.java | 22 +++++-
.../java/com/github/stsaz/phiola/VarMenu.java | 37 ++++++++++
5 files changed, 141 insertions(+), 4 deletions(-)
create mode 100644 android/phiola/src/main/java/com/github/stsaz/phiola/ExplorerMenu.java
create mode 100644 android/phiola/src/main/java/com/github/stsaz/phiola/VarMenu.java
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
index 6cff157..1464762 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
@@ -15,6 +15,8 @@
public class ConvertActivity extends AppCompatActivity {
private static final String TAG = "phiola.ConvertActivity";
Core core;
+ private VarMenu varmenu;
+ private ExplorerMenu explorer;
private long length_msec;
private ConvertBinding b;
@@ -24,6 +26,13 @@ protected void onCreate(Bundle savedInstanceState) {
b = ConvertBinding.inflate(getLayoutInflater());
setContentView(b.getRoot());
+ varmenu = new VarMenu(this);
+ explorer = new ExplorerMenu(this);
+ b.eOutDir.setOnClickListener(v -> explorer.show(b.eOutDir));
+ b.eOutName.setOnClickListener(v -> varmenu.show(b.eOutName, new String[]{
+ "@filename", "@album", "@artist", "@title", "@tracknumber",
+ }));
+
ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item
, CoreSettings.conv_format_display);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/ExplorerMenu.java b/android/phiola/src/main/java/com/github/stsaz/phiola/ExplorerMenu.java
new file mode 100644
index 0000000..daa731a
--- /dev/null
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/ExplorerMenu.java
@@ -0,0 +1,71 @@
+/** phiola/Android
+2024, Simon Zolin */
+
+package com.github.stsaz.phiola;
+
+import android.app.Activity;
+import android.view.MenuItem;
+import android.widget.EditText;
+import android.widget.PopupMenu;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class ExplorerMenu {
+ private Core core;
+ private Activity parent;
+ private EditText ctl;
+ private String path;
+ private String[] files;
+ private boolean up_dir;
+
+ ExplorerMenu(Activity parent) {
+ core = Core.getInstance();
+ this.parent = parent;
+ }
+
+ void show(EditText v) {
+ ctl = v;
+ String[] rows;
+
+ path = ctl.getText().toString();
+ if (path.isEmpty()) {
+ rows = core.storage_paths;
+ files = core.storage_paths;
+ up_dir = false;
+
+ } else {
+ UtilNative.Files f = core.util.dirList(path, 0);
+ ArrayList a = new ArrayList<>(Arrays.asList(f.display_rows).subList(0, f.n_directories));
+ rows = a.toArray(new String[0]);
+ files = f.file_names;
+ up_dir = true;
+ }
+
+ PopupMenu m = new PopupMenu(parent, v);
+ m.setOnMenuItemClickListener(this::menu_click);
+ int i = 0;
+
+ if (up_dir)
+ m.getMenu().add(0, i++, 0, parent.getString(R.string.explorer_up));
+
+ for (String s : rows) {
+ m.getMenu().add(0, i++, 0, s);
+ }
+ m.show();
+ }
+
+ private boolean menu_click(MenuItem item) {
+ int i = item.getItemId();
+ String s;
+ if (i == 0 && up_dir) {
+ s = Util.path_split2(path)[0];
+ } else {
+ if (up_dir)
+ i--;
+ s = files[i];
+ }
+ ctl.setText(s);
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java
index a8d39d4..aac2ca0 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java
@@ -13,7 +13,8 @@
public class ListSaveActivity extends AppCompatActivity {
private static final String TAG = "phiola.ListSaveActivity";
- Core core;
+ private Core core;
+ private ExplorerMenu explorer;
private ListSaveBinding b;
protected void onCreate(Bundle savedInstanceState) {
@@ -21,7 +22,10 @@ protected void onCreate(Bundle savedInstanceState) {
b = ListSaveBinding.inflate(getLayoutInflater());
setContentView(b.getRoot());
+ explorer = new ExplorerMenu(this);
+
b.bSave.setOnClickListener((v) -> save());
+ b.eDir.setOnClickListener(v -> explorer.show(b.eDir));
core = Core.getInstance();
load();
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/SettingsActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/SettingsActivity.java
index 9d43a3c..c5f3df2 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/SettingsActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/SettingsActivity.java
@@ -18,6 +18,7 @@ public class SettingsActivity extends AppCompatActivity {
private static final String TAG = "phiola.SettingsActivity";
private Core core;
private SettingsBinding b;
+ private ExplorerMenu explorer;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -29,6 +30,20 @@ protected void onCreate(Bundle savedInstanceState) {
if (actionBar != null)
actionBar.setDisplayHomeAsUpEnabled(true);
+ explorer = new ExplorerMenu(this);
+
+ play_init();
+
+ b.eDataDir.setOnClickListener(v -> explorer.show(b.eDataDir));
+ b.eQuickMoveDir.setOnClickListener(v -> explorer.show(b.eQuickMoveDir));
+
+ rec_init();
+
+ core = Core.getInstance();
+ load();
+ }
+
+ private void play_init() {
b.sbPlayAutoSkip.setMax(auto_skip_progress(200));
b.sbPlayAutoSkip.setOnSeekBarChangeListener(new SBOnSeekBarChangeListener() {
@Override
@@ -58,6 +73,10 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
}
}
});
+ }
+
+ private void rec_init() {
+ b.eRecDir.setOnClickListener(v -> explorer.show(b.eRecDir));
ArrayAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item
, new String[] {
@@ -131,9 +150,6 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
b.eRecGain.setEnabled(false);
b.swRecExclusive.setEnabled(false);
}
-
- core = Core.getInstance();
- load();
}
@Override
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/VarMenu.java b/android/phiola/src/main/java/com/github/stsaz/phiola/VarMenu.java
new file mode 100644
index 0000000..e249d1a
--- /dev/null
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/VarMenu.java
@@ -0,0 +1,37 @@
+/** phiola/Android
+2024, Simon Zolin */
+
+package com.github.stsaz.phiola;
+
+import android.app.Activity;
+import android.view.MenuItem;
+import android.widget.EditText;
+import android.widget.PopupMenu;
+
+public class VarMenu {
+ private Activity parent;
+ private EditText ctl;
+ private String[] rows;
+
+ VarMenu(Activity parent) {
+ this.parent = parent;
+ }
+
+ void show(EditText v, String[] rows) {
+ ctl = v;
+ this.rows = rows;
+
+ PopupMenu m = new PopupMenu(parent, v);
+ m.setOnMenuItemClickListener(this::menu_click);
+ int i = 0;
+ for (String s : rows) {
+ m.getMenu().add(0, i++, 0, s);
+ }
+ m.show();
+ }
+
+ private boolean menu_click(MenuItem item) {
+ ctl.getText().append(rows[item.getItemId()]);
+ return true;
+ }
+}
From e0e6db4d21908aee11f5bdf84f7fda960482758a Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 08:16:12 +0300
Subject: [PATCH 02/59] * Android: seek forward on long pressing Next button
---
.../com/github/stsaz/phiola/MainActivity.java | 26 +++++++++++++++++--
.../com/github/stsaz/phiola/Settings.java | 7 +++++
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
index 9259ec3..d29a8cc 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
@@ -331,9 +331,17 @@ private void init_ui() {
b.bplay.setOnClickListener((v) -> play_pause_click());
- b.bnext.setOnClickListener((v) -> trackctl.next());
-
b.bprev.setOnClickListener((v) -> trackctl.prev());
+ b.bprev.setOnLongClickListener((v) -> {
+ seek_back();
+ return true;
+ });
+
+ b.bnext.setOnClickListener((v) -> trackctl.next());
+ b.bnext.setOnLongClickListener((v) -> {
+ seek_fwd();
+ return true;
+ });
b.bexplorer.setOnClickListener((v) -> explorer_click());
@@ -877,6 +885,20 @@ private void seek(int percent) {
trackctl.seek((total_dur_msec / 1000) * percent / 100 * 1000);
}
+ private void seek_back() {
+ int percent = b.seekbar.getProgress() - core.setts.play_seek_back_percent;
+ if (percent < 0)
+ percent = 0;
+ seek(percent);
+ }
+
+ private void seek_fwd() {
+ int percent = b.seekbar.getProgress() + core.setts.play_seek_fwd_percent;
+ if (percent >= 100)
+ percent = 99;
+ seek(percent);
+ }
+
// [Playing]
// [PLA,STP,REC|RPA,CON]
private String state_flags(int st) {
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
index 21eb38c..0cffa38 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
@@ -67,6 +67,8 @@ void auto_skip_tail_set(String s) {
core.phiola.playCmd(Phiola.PC_AUTO_SKIP_TAIL, n);
}
+ int play_seek_fwd_percent, play_seek_back_percent;
+
String rec_path; // directory for recordings
String rec_name_template;
String rec_enc, rec_fmt;
@@ -284,6 +286,11 @@ void normalize() {
if (trash_dir.isEmpty())
trash_dir = "Trash";
+ if (play_seek_fwd_percent <= 0 || play_seek_fwd_percent > 50)
+ play_seek_fwd_percent = 5;
+ if (play_seek_back_percent <= 0 || play_seek_back_percent > 50)
+ play_seek_back_percent = 5;
+
normalize_rec();
normalize_convert();
}
From e6643f97b68a90a4e21403ac97abd02a4be63271 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 08:16:12 +0300
Subject: [PATCH 03/59] + Android: Convert: new setting: `Sample Format`
---
.../com/github/stsaz/phiola/ConvertActivity.java | 7 +++++++
.../main/java/com/github/stsaz/phiola/Phiola.java | 1 +
.../java/com/github/stsaz/phiola/Settings.java | 14 ++++++++++++++
android/phiola/src/main/res/layout/convert.xml | 12 ++++++++++++
android/phiola/src/main/res/values/strings.xml | 1 +
src/jni/queue.h | 6 ++++++
6 files changed, 41 insertions(+)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
index 1464762..4429c0f 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
@@ -61,6 +61,11 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
});
b.bUntilSetCur.setOnClickListener((v) -> pos_set_cur(false));
+ adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item
+ , CoreSettings.conv_sample_formats_str);
+ adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ b.spSampleFormat.setAdapter(adapter);
+
b.sbAacQ.setMax(aac_q_progress(5));
b.sbAacQ.setOnSeekBarChangeListener(new SBOnSeekBarChangeListener() {
@Override
@@ -89,6 +94,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
});
b.swCopy.setOnCheckedChangeListener((v, checked) -> {
+ b.spSampleFormat.setEnabled(!checked);
b.eSampleRate.setEnabled(!checked);
b.sbAacQ.setEnabled(!checked);
@@ -261,6 +267,7 @@ private void convert() {
Phiola.ConvertParams p = new Phiola.ConvertParams();
p.from_msec = b.eFrom.getText().toString();
p.to_msec = b.eUntil.getText().toString();
+ p.sample_format = CoreSettings.conv_sample_formats[b.spSampleFormat.getSelectedItemPosition()];
p.sample_rate = core.str_to_uint(b.eSampleRate.getText().toString(), 0);
p.aac_quality = core.setts.conv_aac_quality;
p.opus_quality = core.setts.conv_opus_quality;
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
index 824d405..9c57c8a 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
@@ -70,6 +70,7 @@ static class ConvertParams {
String out_name;
String from_msec, to_msec;
+ int sample_format;
int sample_rate;
int aac_quality;
int opus_quality;
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
index 0cffa38..9327104 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
@@ -99,6 +99,20 @@ void auto_skip_tail_set(String s) {
boolean conv_copy;
boolean conv_file_date_preserve;
boolean conv_new_add_list;
+ static final int[] conv_sample_formats = {
+ 0,
+ 8, // PHI_PCM_8
+ 16, // PHI_PCM_16
+ 24, // PHI_PCM_24
+ 32, // PHI_PCM_32
+ };
+ static final String[] conv_sample_formats_str = {
+ "As Source",
+ "int8",
+ "int16",
+ "int24",
+ "int32",
+ };
static final int conv_encoders[] = {
Phiola.AF_AAC_LC,
Phiola.AF_AAC_HE,
diff --git a/android/phiola/src/main/res/layout/convert.xml b/android/phiola/src/main/res/layout/convert.xml
index dae4b14..c3f2fe4 100644
--- a/android/phiola/src/main/res/layout/convert.xml
+++ b/android/phiola/src/main/res/layout/convert.xml
@@ -132,6 +132,18 @@
android:text="@string/conv_filters"
android:textColor="@color/sett_group" />
+
+
+
End Audio Position:
Filters
+ Sample Format
Sample rate (Hz):
Encoding
diff --git a/src/jni/queue.h b/src/jni/queue.h
index 28d3749..65f26bb 100644
--- a/src/jni/queue.h
+++ b/src/jni/queue.h
@@ -443,6 +443,7 @@ Java_com_github_stsaz_phiola_Phiola_quConvertBegin(JNIEnv *env, jobject thiz, jl
struct phi_track_conf conf = {
.ifile.preserve_date = !!(flags & F_DATE_PRESERVE),
.stream_copy = !!(flags & F_COPY),
+ .oaudio.format.format = jni_obj_int(jconf, jni_field_int(jc_conf, "sample_format")),
.oaudio.format.rate = jni_obj_int(jconf, jni_field_int(jc_conf, "sample_rate")),
.aac.quality = jni_obj_int(jconf, jni_field_int(jc_conf, "aac_quality")),
.vorbis.quality = jni_obj_int(jconf, jni_field_int(jc_conf, "vorbis_quality")),
@@ -470,14 +471,19 @@ Java_com_github_stsaz_phiola_Phiola_quConvertBegin(JNIEnv *env, jobject thiz, jl
struct phi_queue_entry *qe;
for (i = 0; !!(qe = x->queue.at(q, i)); i++) {
struct phi_track_conf *c = &qe->conf;
+
c->ifile.preserve_date = conf.ifile.preserve_date;
c->seek_msec = conf.seek_msec;
c->until_msec = conf.until_msec;
c->stream_copy = conf.stream_copy;
+
+ c->oaudio.format.format = conf.oaudio.format.format;
c->oaudio.format.rate = conf.oaudio.format.rate;
+
c->aac.quality = conf.aac.quality;
c->vorbis.quality = conf.vorbis.quality;
c->opus.bitrate = conf.opus.bitrate;
+
c->ofile.name = ffsz_dup(ofn);
c->ofile.name_tmp = 1;
c->ofile.overwrite = conf.ofile.overwrite;
From 80ee799cf25a07afb48f6d9fc89ac7fa76dc584c Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 08:16:12 +0300
Subject: [PATCH 04/59] * .ogg read: support chained Opus stream
---
doc/arch/arch.md | 18 ++++++++
src/acodec/opus-dec.h | 25 +++++++----
src/format/ogg-read.h | 16 +++++--
src/format/opus-meta.h | 94 ++++++++++++++++++++++++++++--------------
src/track.h | 1 +
test.sh | 13 ++++++
6 files changed, 123 insertions(+), 44 deletions(-)
diff --git a/doc/arch/arch.md b/doc/arch/arch.md
index 7222af3..237ad5e 100644
--- a/doc/arch/arch.md
+++ b/doc/arch/arch.md
@@ -85,6 +85,24 @@ Key factor: 'fmt' and 'dec' know nothing about `abs_seek`;
`AS` - audio offset for the current .cue track (`abs_seek`).
+## .ogg chained stream reading
+
+```C
+ogg.wr opus-meta opus.dec
+=======================================
+...
+* detects new stream
+RST=1 -hdr-> ?RST
+ *hdr
+ -> *tag -hdr-> ?RST
+ RST=0 <- *skip
+ -> *data -tag-> *skip
+ -data-> *decode
+```
+
+`RST` flag is set when a new logical stream is detected; it signifies that the next 2 packets are opus-info and vorbis-tags.
+
+
## .ogg write
Case 1. Add packets normally with known audio position of every packet.
diff --git a/src/acodec/opus-dec.h b/src/acodec/opus-dec.h
index a448777..ed378a0 100644
--- a/src/acodec/opus-dec.h
+++ b/src/acodec/opus-dec.h
@@ -17,14 +17,6 @@ static void* opus_open(phi_track *t)
return PHI_OPEN_ERR;
struct opus_dec *o = phi_track_allocT(t, struct opus_dec);
-
- if (ffopus_open(&o->opus)) {
- errlog(t, "ffopus_open(): %s", ffopus_errstr(&o->opus));
- phi_track_free(t, o);
- return PHI_OPEN_ERR;
- }
-
- o->prev_page_pos = ~0ULL;
return o;
}
@@ -46,7 +38,7 @@ static const char* opus_pkt_mode(const char *d)
static int opus_in_decode(void *ctx, phi_track *t)
{
- enum { R_HDR, R_TAGS, R_DATA1, R_DATA };
+ enum { R_INIT, R_HDR, R_TAGS, R_DATA1, R_DATA };
struct opus_dec *o = ctx;
int r;
const char *opus_mode = NULL;
@@ -63,6 +55,15 @@ static int opus_in_decode(void *ctx, phi_track *t)
ffstr out;
for (;;) {
switch (o->state) {
+ case R_INIT:
+ if (ffopus_open(&o->opus)) {
+ errlog(t, "ffopus_open(): %s", ffopus_errstr(&o->opus));
+ return PHI_ERR;
+ }
+ o->prev_page_pos = ~0ULL;
+ o->state = R_HDR;
+ // fallthrough
+
case R_HDR:
case R_TAGS:
if (!(t->chain_flags & PHI_FFWD))
@@ -84,6 +85,12 @@ static int opus_in_decode(void *ctx, phi_track *t)
// fallthrough
case R_DATA:
+ if (t->audio.ogg_reset) {
+ ffopus_close(&o->opus);
+ ffmem_zero_obj(o);
+ continue;
+ }
+
if (t->audio.seek_req) {
// a new seek request is received, pass control to UI module
o->reset_decoder = 1;
diff --git a/src/format/ogg-read.h b/src/format/ogg-read.h
index 58c0b1c..f25134e 100644
--- a/src/format/ogg-read.h
+++ b/src/format/ogg-read.h
@@ -7,6 +7,7 @@ struct ogg_r {
oggread og;
ffstr in;
void *trk;
+ uint page_serial;
uint sample_rate;
uint state;
uint stmcopy :1;
@@ -133,15 +134,24 @@ static int ogg_read(void *ctx, phi_track *t)
}
return PHI_MORE;
- case OGGREAD_HEADER:
- case OGGREAD_DATA:
+ case OGGREAD_HEADER: {
+ const struct oggread_info *i = oggread_info(&o->og);
if (o->state == I_HDR) {
o->state = I_INFO;
- const struct oggread_info *i = oggread_info(&o->og);
t->audio.total = (i->total_samples) ? i->total_samples : ~0ULL;
if (0 != add_decoder(o, t, t->data_out))
return PHI_ERR;
+ } else {
+ if (o->page_serial != i->serial) {
+ dbglog(t, "new logical stream");
+ t->audio.ogg_reset = 1;
+ }
}
+ o->page_serial = i->serial;
+ goto data;
+ }
+
+ case OGGREAD_DATA:
goto data;
case OGGREAD_DONE:
diff --git a/src/format/opus-meta.h b/src/format/opus-meta.h
index 0aadcd8..61e5e64 100644
--- a/src/format/opus-meta.h
+++ b/src/format/opus-meta.h
@@ -4,6 +4,7 @@
#include
#include
+extern const phi_meta_if phi_metaif;
extern int vorbistag_read(phi_track *t, ffstr vc);
struct opus_hdr {
@@ -52,6 +53,7 @@ static int opuscomment_read(ffstr pkt, ffstr *body)
struct opusmeta {
uint state;
+ uint reset :1;
ffvec hdr;
ffstr tags;
};
@@ -72,43 +74,71 @@ static void opusmeta_close(void *ctx, phi_track *t)
static int opusmeta_read(void *ctx, phi_track *t)
{
struct opusmeta *o = ctx;
- switch (o->state) {
- case 0: {
- struct opus_info info;
- if (0 != opusinfo_read(&info, t->data_in)) {
- errlog(t, "opusinfo_read");
- return PHI_ERR;
+ for (;;) {
+ switch (o->state) {
+ case 0: {
+ struct opus_info info;
+ if (0 != opusinfo_read(&info, t->data_in)) {
+ errlog(t, "opusinfo_read");
+ return PHI_ERR;
+ }
+ t->audio.decoder = "Opus";
+
+ if (o->reset) {
+ if (!(info.channels == t->audio.format.channels
+ && info.rate == t->audio.format.rate)) {
+ errlog(t, "changing the audio format on-the-fly is not supported");
+ return PHI_ERR;
+ }
+ t->meta_changed = 1;
+ }
+
+ struct phi_af f = {
+ .format = PHI_PCM_FLOAT32,
+ .channels = info.channels,
+ .rate = info.rate,
+ };
+ t->audio.format = f;
+
+ ffvec_addstr(&o->hdr, &t->data_in);
+ o->state = 1;
+ return PHI_MORE;
}
- t->audio.decoder = "Opus";
- struct phi_af f = {
- .format = PHI_PCM_FLOAT32,
- .channels = info.channels,
- .rate = info.rate,
- };
- t->audio.format = f;
-
- ffvec_addstr(&o->hdr, &t->data_in);
- o->state = 1;
- return PHI_MORE;
- }
- case 1: {
- ffstr vc;
- if (0 != opuscomment_read(t->data_in, &vc)) {
- errlog(t, "opuscomment_read");
- return PHI_ERR;
+ case 1: {
+ ffstr vc;
+ if (0 != opuscomment_read(t->data_in, &vc)) {
+ errlog(t, "opuscomment_read");
+ return PHI_ERR;
+ }
+ vorbistag_read(t, vc);
+
+ o->tags = t->data_in;
+ t->data_out = *(ffstr*)&o->hdr;
+ o->state = 2;
+ return PHI_DATA;
}
- vorbistag_read(t, vc);
- o->tags = t->data_in;
- t->data_out = *(ffstr*)&o->hdr;
- o->state = 2;
- return PHI_DATA;
- }
+ case 2:
+ t->audio.ogg_reset = 0;
+ ffvec_free(&o->hdr);
+ o->state = 3;
+ t->data_out = o->tags;
+ return (t->conf.info_only) ? PHI_LASTOUT
+ : (t->chain_flags & PHI_FFIRST) ? PHI_DONE
+ : PHI_OK;
+
+ case 3:
+ if (t->audio.ogg_reset) {
+ phi_metaif.destroy(&t->meta);
+ o->reset = 1;
+ o->state = 0;
+ continue;
+ }
+ t->data_out = t->data_in;
+ return (t->chain_flags & PHI_FFIRST) ? PHI_DONE : PHI_OK;
+ }
}
-
- t->data_out = o->tags;
- return (t->conf.info_only) ? PHI_LASTOUT : PHI_DONE;
}
const phi_filter phi_opusmeta_read = {
diff --git a/src/track.h b/src/track.h
index 88209ff..ada2a57 100644
--- a/src/track.h
+++ b/src/track.h
@@ -165,6 +165,7 @@ struct phi_track {
uint64 pos, total; // samples; -1:unset/unknown
int64 seek; // >0:msec; -1:unset
uint seek_req :1; // New seek request is received (UI -> fmt.read)
+ uint ogg_reset :1; // ogg.read -> opus.meta
uint bitrate;
double gain_db; // Audio gain/attenuation
double maxpeak_db;
diff --git a/test.sh b/test.sh
index f282eb0..45540e4 100644
--- a/test.sh
+++ b/test.sh
@@ -208,6 +208,18 @@ test_seek() {
./phiola i -peaks -s 1 fm_wv.wv | grep '48,000 total'
}
+test_ogg() {
+ if ! test -f pl.wav ; then
+ ./phiola rec -rate 48000 -o pl.wav -f -u 2
+ fi
+
+ # Chained OGG(Opus) stream
+ ./phiola co pl.wav -o ogg1.opus -f
+ ./phiola co pl.wav -o ogg2.opus -f
+ cat ogg1.opus ogg2.opus >ogg3.opus
+ ./phiola pl ogg3.opus
+}
+
test_convert_af() {
O=co_wav_i24.wav ; ./phiola co co.wav -af int24 -f -o $O ; ./phiola i $O | grep 'int24' ; ./phiola pl $O
O=co_wav_mono.wav ; ./phiola co co.wav -ch 1 -f -o $O ; ./phiola i $O | grep 'mono' ; ./phiola pl $O
@@ -664,6 +676,7 @@ TESTS=(
info
until
seek
+ ogg
copy
meta
danorm
From 16cd4d7375a2b7e0db4bf43c43e9fe0d416c597e Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 08:16:12 +0300
Subject: [PATCH 05/59] - couldn't convert from .ogg(Vorbis) to .ogg(Opus)
---
src/track.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/track.h b/src/track.h
index ada2a57..dd64c3d 100644
--- a/src/track.h
+++ b/src/track.h
@@ -97,7 +97,7 @@ struct phi_filter {
char name[16];
};
-#define MAX_FILTERS 20
+#define MAX_FILTERS 24
struct filter {
void *obj;
From d0648ddf78a2d4cf3bb94114552cea0cd09da89b Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 08:16:12 +0300
Subject: [PATCH 06/59] minor
---
.../src/main/java/com/github/stsaz/phiola/Explorer.java | 4 ----
src/acodec/alib3-bridge/opus-dec-if.h | 6 ++++--
src/afilter/soxr-conv.h | 4 +++-
src/core/track.c | 7 ++++---
src/format/ogg-write.h | 2 +-
src/jni/convert.h | 2 ++
src/net/http.c | 1 -
src/track.h | 1 +
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Explorer.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Explorer.java
index 6f607e4..382c8aa 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Explorer.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Explorer.java
@@ -11,10 +11,6 @@
import androidx.core.app.ActivityCompat;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-
class Explorer {
private static final String TAG = "phiola.Explorer";
private final Core core;
diff --git a/src/acodec/alib3-bridge/opus-dec-if.h b/src/acodec/alib3-bridge/opus-dec-if.h
index bdb7b1b..859c941 100644
--- a/src/acodec/alib3-bridge/opus-dec-if.h
+++ b/src/acodec/alib3-bridge/opus-dec-if.h
@@ -155,8 +155,10 @@ int ffopus_decode(ffopus *o, ffstr *input, ffstr *output, uint64 *pos)
float *pcm = (void*)o->pcmbuf.ptr;
r = opus_decode_f(o->dec, input->ptr, input->len, pcm);
- if (r < 0)
- return ERR(o, r);
+ if (r < 0) {
+ o->err = r;
+ return FFOPUS_RWARN;
+ }
input->len = 0;
ffstr_set(output, pcm, r * o->info.channels * sizeof(float));
diff --git a/src/afilter/soxr-conv.h b/src/afilter/soxr-conv.h
index 8847c44..09f1096 100644
--- a/src/afilter/soxr-conv.h
+++ b/src/afilter/soxr-conv.h
@@ -61,8 +61,10 @@ static int soxr_conv(void *ctx, phi_track *t)
if (0 != (val = ffsoxr_create(&c->soxr, &inpcm, &outpcm))
|| (core->conf.log_level >= PHI_LOG_DEBUG)) {
log_pcmconv(val, &inpcm, &outpcm, t);
- if (val != 0)
+ if (val != 0) {
+ t->error = PHI_E_ACONV;
return PHI_ERR;
+ }
}
c->state = 3;
diff --git a/src/core/track.c b/src/core/track.c
index 4510610..1459d37 100644
--- a/src/core/track.c
+++ b/src/core/track.c
@@ -214,8 +214,9 @@ static int trk_filter_add(phi_track *t, const phi_filter *iface, uint pos)
t->conveyor.n_active++;
char buf[200];
- dbglog(t, "%s: added to chain [%s]"
- , f->iface->name, conveyor_print(v, f, buf, sizeof(buf)));
+ dbglog(t, "%s: added to chain [%u/%u] {%s}"
+ , f->iface->name, t->conveyor.n_active, v->i_fpool
+ , conveyor_print(v, f, buf, sizeof(buf)));
return pos;
}
@@ -358,7 +359,7 @@ static int trk_filter_handle_result(phi_track *t, struct filter *f, int r)
if (chain_modified) {
char buf[200];
- dbglog(t, "chain (%u): [%s]"
+ dbglog(t, "chain [%u] {%s}"
, t->conveyor.n_active, conveyor_print(&t->conveyor, NULL, buf, sizeof(buf)));
}
diff --git a/src/format/ogg-write.h b/src/format/ogg-write.h
index c542b1e..353370d 100644
--- a/src/format/ogg-write.h
+++ b/src/format/ogg-write.h
@@ -23,7 +23,7 @@ static void* ogg_w_open(phi_track *t)
seed = 1;
fftime t;
fftime_now(&t);
- ffrand_seed(fftime_sec(&t));
+ ffrand_seed(fftime_sec(&t) + fftime_nsec(&t));
}
return o;
diff --git a/src/jni/convert.h b/src/jni/convert.h
index 45ca3c7..3f88cf2 100644
--- a/src/jni/convert.h
+++ b/src/jni/convert.h
@@ -27,12 +27,14 @@ static const char* trk_errstr(uint e)
return fferr_strptr(e & ~PHI_E_SYS);
e--;
+ // enum PHI_E
static const char errstr[][30] = {
"Input file doesn't exist", // PHI_E_NOSRC
"Output file already exists", // PHI_E_DSTEXIST
"Unknown input file format", // PHI_E_UNKIFMT
"Input audio device problem", // PHI_E_AUDIO_INPUT
"Cancelled", // PHI_E_CANCELLED
+ "Sample conversion", // PHI_E_ACONV
};
const char *s = "Unknown";
if (e < FF_COUNT(errstr))
diff --git a/src/net/http.c b/src/net/http.c
index 141b459..f26e284 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -336,7 +336,6 @@ static void net_close()
#ifndef PHI_HTTP_NO_SSL
nml_ssl_uninit(phi_ssl_ctx);
if (phi_ssl_ctx) {
- ffmem_free(phi_ssl_ctx->ctx_conf->cert_file);
ffmem_free(phi_ssl_ctx->ctx_conf);
ffmem_free(phi_ssl_ctx);
}
diff --git a/src/track.h b/src/track.h
index dd64c3d..0c80475 100644
--- a/src/track.h
+++ b/src/track.h
@@ -128,6 +128,7 @@ enum PHI_E {
PHI_E_UNKIFMT, // unknown input format
PHI_E_AUDIO_INPUT,
PHI_E_CANCELLED,
+ PHI_E_ACONV, // audio conversion
PHI_E_OTHER = 255,
PHI_E_SYS = 0x80000000,
};
From ee11422cddda60023621f2ad170decd81bd18936 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 28 Sep 2024 08:16:12 +0300
Subject: [PATCH 07/59] 2.2.7
---
android/phiola/build.gradle | 4 ++--
src/phiola.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/android/phiola/build.gradle b/android/phiola/build.gradle
index b299c9b..930f75f 100644
--- a/android/phiola/build.gradle
+++ b/android/phiola/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.github.stsaz.phiola"
minSdkVersion 16
targetSdk 33
- versionCode 20206
- versionName '2.2.6'
+ versionCode 20207
+ versionName '2.2.7'
}
buildFeatures {
diff --git a/src/phiola.h b/src/phiola.h
index 747d273..2f4d622 100644
--- a/src/phiola.h
+++ b/src/phiola.h
@@ -6,7 +6,7 @@
#include
#include
-#define PHI_VERSION 20206
+#define PHI_VERSION 20207
/** Inter-module compatibility version.
It must be updated when incompatible changes are made to this file,
From 5c2bb2c55d1b97cfffab39bc1418a809ad7272ef Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 2 Nov 2024 10:19:44 +0300
Subject: [PATCH 08/59] - HTTP: query string was not passed to server
---
src/exe/cmd.h | 6 ++++--
src/net/http.c | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/exe/cmd.h b/src/exe/cmd.h
index 31d74b2..01d328d 100644
--- a/src/exe/cmd.h
+++ b/src/exe/cmd.h
@@ -144,8 +144,10 @@ static int cmd_input(ffvec *input, ffstr s)
return cmd_input_names(input, ffstdin);
#ifdef FF_WIN
- if (ffstr_findany(&s, "*?", 2) >= 0
- && !ffstr_matchz(&s, "\\\\?\\")) {
+ if (!(ffstr_matchz(&s, "http://")
+ || ffstr_matchz(&s, "https://")
+ || ffstr_matchz(&s, "\\\\?\\"))
+ && ffstr_findany(&s, "*?", 2) >= 0) {
if (!!wildcard_expand(input, s))
return 1;
} else
diff --git a/src/net/http.c b/src/net/http.c
index f26e284..9b2fc7e 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -225,6 +225,8 @@ static int conf_prepare(struct httpcl *h, struct nml_http_client_conf *c, phi_tr
c->host.len += p.port.len;
if (!p.port.len)
c->server_port = 80;
+ if (p.query.len)
+ p.path.len += p.query.len; // = "/path?query"
ffvec_alloc(&h->path, p.path.len * 3, 1);
h->path.len = httpurl_escape(h->path.ptr, h->path.cap, p.path);
c->path = *(ffstr*)&h->path;
From 980815c1d10352029b4cb8ce2bec56f444d3b013 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 2 Nov 2024 10:19:44 +0300
Subject: [PATCH 09/59] + new remote command: `volume`
---
src/exe/remote.h | 1 +
src/remote-ctl.c | 10 ++++++++++
src/tui/play.h | 2 +-
src/tui/tui.c | 5 ++++-
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/exe/remote.h b/src/exe/remote.h
index dd2c165..3166b2e 100644
--- a/src/exe/remote.h
+++ b/src/exe/remote.h
@@ -14,6 +14,7 @@ Commands:\n\
`next` Play next track\n\
`previous` Play previous track\n\
`stop` Stop all tracks\n\
+ `volume` NUMBER Set playback volume level: 0..100\n\
`quit` Exit\n\
");
x->exit_code = 0;
diff --git a/src/remote-ctl.c b/src/remote-ctl.c
index 8ed11b8..be37a4d 100644
--- a/src/remote-ctl.c
+++ b/src/remote-ctl.c
@@ -62,6 +62,15 @@ static int cmd_quit() {
return 0;
}
+static int cmd_volume(void *o, uint64 n) {
+ struct phi_ui_conf uc = {
+ .volume_percent = n,
+ };
+ const phi_ui_if *uif = g->core->mod("tui.if");
+ uif->conf(&uc);
+ return 0;
+}
+
static const struct ffarg args[] = {
{ "clear", '1', cmd_clear },
{ "next", '1', cmd_next },
@@ -70,6 +79,7 @@ static const struct ffarg args[] = {
{ "quit", '1', cmd_quit },
{ "start", 'S', cmd_start },
{ "stop", '1', cmd_stop },
+ { "volume", 'u', cmd_volume },
{}
};
diff --git a/src/tui/play.h b/src/tui/play.h
index c9beec7..93a59ae 100644
--- a/src/tui/play.h
+++ b/src/tui/play.h
@@ -151,7 +151,7 @@ static double tui_setvol(tui_track *u, uint vol)
static void tuiplay_vol(tui_track *u, uint cmd)
{
- uint vol = 0;
+ uint vol = mod->vol;
switch (cmd & ~FFKEY_MODMASK) {
case CMD_VOLUP:
diff --git a/src/tui/tui.c b/src/tui/tui.c
index ab714f5..0288c49 100644
--- a/src/tui/tui.c
+++ b/src/tui/tui.c
@@ -423,8 +423,11 @@ static void tui_destroy()
static void tui_conf(struct phi_ui_conf *c)
{
- if (c->volume_percent != 0xff)
+ if (c->volume_percent != 0xff) {
mod->vol = ffmin((uint)c->volume_percent, VOL_MAX);
+ if (mod->curtrk)
+ tuiplay_vol(mod->curtrk, ~0U);
+ }
}
static struct phi_ui_if phi_tui_if = {
From 0f8517a496227f12eece7c7379a1b2096c5ad19a Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 2 Nov 2024 10:19:44 +0300
Subject: [PATCH 10/59] Android: About: "Enable debug logging"
---
.../main/java/com/github/stsaz/phiola/AboutActivity.java | 9 +++++++++
.../src/main/java/com/github/stsaz/phiola/Phiola.java | 1 +
.../src/main/java/com/github/stsaz/phiola/Settings.java | 1 +
android/phiola/src/main/res/layout/about.xml | 7 +++++++
android/phiola/src/main/res/values/strings.xml | 1 +
src/jni/phiola-jni.c | 7 +++++++
6 files changed, 26 insertions(+)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/AboutActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/AboutActivity.java
index a9abc46..e5b428c 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/AboutActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/AboutActivity.java
@@ -25,6 +25,10 @@ protected void onCreate(Bundle savedInstanceState) {
b.lAbout.setText(String.format("v%s\n\n%s",
core.phiola.version(),
"https://github.com/stsaz/phiola"));
+
+ b.bDebugLog.setChecked(core.setts.debug_logs);
+ b.bDebugLog.setOnClickListener((v) -> logs_debug());
+
b.bSaveLogs.setOnClickListener((v) -> logs_save_file());
}
@@ -33,6 +37,11 @@ protected void onDestroy() {
super.onDestroy();
}
+ private void logs_debug() {
+ core.setts.debug_logs = !core.setts.debug_logs;
+ core.phiola.setDebug(core.setts.debug_logs);
+ }
+
private void logs_save_file() {
String fn = String.format("%s/logs.txt", core.setts.pub_data_dir);
String[] args = new String[]{
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
index 9c57c8a..766bd43 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
@@ -17,6 +17,7 @@ private static boolean lib_load(String filename) {
native String version();
native void setCodepage(String codepage);
+ native void setDebug(boolean enable);
static class Meta {
int queue_pos;
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
index 9327104..e56efd7 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Settings.java
@@ -43,6 +43,7 @@ static int parse(String s) {
class CoreSettings {
private Core core;
+ boolean debug_logs;
boolean svc_notification_disable;
String trash_dir;
boolean file_del;
diff --git a/android/phiola/src/main/res/layout/about.xml b/android/phiola/src/main/res/layout/about.xml
index 82601a0..2624e65 100644
--- a/android/phiola/src/main/res/layout/about.xml
+++ b/android/phiola/src/main/res/layout/about.xml
@@ -18,6 +18,13 @@
android:gravity="center_horizontal"
android:textAlignment="center" />
+
+
+ Enable debug logging
Save system logs to file
Saved logs to %s
diff --git a/src/jni/phiola-jni.c b/src/jni/phiola-jni.c
index 114fd04..25d9378 100644
--- a/src/jni/phiola-jni.c
+++ b/src/jni/phiola-jni.c
@@ -356,6 +356,13 @@ Java_com_github_stsaz_phiola_Phiola_setCodepage(JNIEnv *env, jobject thiz, jstri
jni_sz_free(sz, jcodepage);
}
+JNIEXPORT void JNICALL
+Java_com_github_stsaz_phiola_Phiola_setDebug(JNIEnv *env, jobject thiz, jboolean enable)
+{
+ x->debug = !!enable;
+ x->core->conf.log_level = (x->debug) ? PHI_LOG_EXTRA : PHI_LOG_VERBOSE;
+}
+
JNIEXPORT jint JNI_OnLoad(JavaVM *_jvm, void *reserved)
{
jvm = _jvm;
From 68bf97c497be5462211fa55bbcf1b57e59b3fc37 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 2 Nov 2024 10:19:44 +0300
Subject: [PATCH 11/59] minor
---
src/format/mp3-write.h | 4 +++-
src/jni/convert.h | 1 +
src/track.h | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/format/mp3-write.h b/src/format/mp3-write.h
index 36b938e..8abd46d 100644
--- a/src/format/mp3-write.h
+++ b/src/format/mp3-write.h
@@ -66,8 +66,10 @@ int mpeg_out_process(void *ctx, phi_track *t)
return PHI_ERR;
}
- if (!core->track->filter(t, core->mod("mpeg.encode"), PHI_TF_PREV))
+ if (!core->track->filter(t, core->mod("mpeg.encode"), PHI_TF_PREV)) {
+ t->error = PHI_E_OUT_FMT;
return PHI_ERR;
+ }
return PHI_MORE;
case 2:
diff --git a/src/jni/convert.h b/src/jni/convert.h
index 3f88cf2..dc06820 100644
--- a/src/jni/convert.h
+++ b/src/jni/convert.h
@@ -35,6 +35,7 @@ static const char* trk_errstr(uint e)
"Input audio device problem", // PHI_E_AUDIO_INPUT
"Cancelled", // PHI_E_CANCELLED
"Sample conversion", // PHI_E_ACONV
+ "Output format is not supported", // PHI_E_OUT_FMT
};
const char *s = "Unknown";
if (e < FF_COUNT(errstr))
diff --git a/src/track.h b/src/track.h
index 0c80475..2e8c967 100644
--- a/src/track.h
+++ b/src/track.h
@@ -129,6 +129,7 @@ enum PHI_E {
PHI_E_AUDIO_INPUT,
PHI_E_CANCELLED,
PHI_E_ACONV, // audio conversion
+ PHI_E_OUT_FMT,
PHI_E_OTHER = 255,
PHI_E_SYS = 0x80000000,
};
From f1251a3f979e76249f21080bc0d74cf143873dd2 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 2 Nov 2024 10:19:44 +0300
Subject: [PATCH 12/59] 2.2.8
---
android/phiola/build.gradle | 4 ++--
src/phiola.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/android/phiola/build.gradle b/android/phiola/build.gradle
index 930f75f..11f6792 100644
--- a/android/phiola/build.gradle
+++ b/android/phiola/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.github.stsaz.phiola"
minSdkVersion 16
targetSdk 33
- versionCode 20207
- versionName '2.2.7'
+ versionCode 20208
+ versionName '2.2.8'
}
buildFeatures {
diff --git a/src/phiola.h b/src/phiola.h
index 2f4d622..d93e1fb 100644
--- a/src/phiola.h
+++ b/src/phiola.h
@@ -6,7 +6,7 @@
#include
#include
-#define PHI_VERSION 20207
+#define PHI_VERSION 20208
/** Inter-module compatibility version.
It must be updated when incompatible changes are made to this file,
From 5a67775c46fec6c302a946e86eb40b7a413721f3 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 09:49:08 +0300
Subject: [PATCH 13/59] + playback HLS radio streams
---
src/core/queue-entry.h | 3 +
src/net/Makefile | 3 +
src/net/hls.h | 206 +++++++++++++++++++++++++++++++++++++++++
src/net/http-filters.c | 3 +
src/net/http.c | 167 +++++++++++++++++++++++++++++----
src/util/util.h | 13 +++
test.sh | 25 ++++-
7 files changed, 397 insertions(+), 23 deletions(-)
create mode 100644 src/net/hls.h
diff --git a/src/core/queue-entry.h b/src/core/queue-entry.h
index 955280b..1bcca1f 100644
--- a/src/core/queue-entry.h
+++ b/src/core/queue-entry.h
@@ -205,6 +205,9 @@ static int qe_expand(struct q_entry *e)
struct phi_track_conf *c = &e->pub.conf;
const phi_track_if *track = core->track;
+ if (url_checkz(c->ifile.name))
+ return -1;
+
ffbool dir = 0, decompress = 0;
fffileinfo fi;
if (!fffile_info_path(c->ifile.name, &fi)
diff --git a/src/net/Makefile b/src/net/Makefile
index acc35b8..e19041f 100644
--- a/src/net/Makefile
+++ b/src/net/Makefile
@@ -24,6 +24,7 @@ MODS += http.$(SO)
HTTP_OBJ := http.o \
icy.o \
+ netmill-core-cache.o \
netmill-http-client.o \
netmill-http-filters.o
@@ -69,5 +70,7 @@ netmill-http-filters.o: $(PHIOLA)/src/net/http-filters.c
$(C) $(CFLAGS_NETMILL) -I$(PHIOLA)/src -I$(FFSYS) $< -o $@
netmill-http-client.o: $(NETMILL)/src/http-client/client.c
$(C) $(CFLAGS_NETMILL) -I$(FFSYS) $< -o $@
+netmill-core-cache.o: $(NETMILL)/src/core/cache.c
+ $(C) $(CFLAGS_NETMILL) -I$(FFSYS) $< -o $@
ffssl.o: $(NETMILL)/src/util/ffssl.c
$(C) $(CFLAGS_NETMILL) -I$(FFSYS) $< -o $@
diff --git a/src/net/hls.h b/src/net/hls.h
new file mode 100644
index 0000000..02cf88e
--- /dev/null
+++ b/src/net/hls.h
@@ -0,0 +1,206 @@
+/** phiola: HLS reader
+2024, Simon Zolin */
+
+/*
+HLS client algorithm:
+. Repeat:
+ . Request .m3u8 by HTTP and receive its data
+ . Parse the data and get file names
+ . Determine which files are new from the last time (using #EXT-X-MEDIA-SEQUENCE value)
+ . If there are no new files, wait
+ . Add new files to the queue
+ . Repeat:
+ . Pop the first data file from the queue
+ . If the queue is empty, exit the loop
+ . Prepare a complete URL for the file (base URL for .m3u8 file + file name)
+ . Request the data file by HTTP
+ . Pass file data to the next filters
+*/
+
+/*
+Call map:
+ ... [phiola]
+ httpcl_process()
+ nml_http_client_run()
+ ... [.m3u] [netmill]
+ phi_hc_data()
+ on_complete()
+ hls_f_request()
+ nml_http_client_run()
+ ... [.ogg] [netmill]
+ phi_hc_data()
+ ... [phiola]
+ httpcl_process()
+ ... [.ogg] [netmill]
+ on_complete()
+ hls_f_request()
+ ...
+*/
+
+struct hlsread {
+ ffvec data, url;
+ ffvec q; // ffstr[]
+ ffstr base_url;
+ uint64 seq_last;
+ phi_timer wait;
+ phi_task task;
+ uint worker;
+ uint n_fail_tries;
+ uint data_file :1;
+};
+
+static struct hlsread* hls_new(struct httpcl *h)
+{
+ struct hlsread *l = ffmem_new(struct hlsread);
+ ffpath_splitpath_str(FFSTR_Z(h->trk->conf.ifile.name), &l->base_url, NULL);
+ l->worker = h->trk->worker;
+ return l;
+}
+
+static void hls_free(struct httpcl *h, struct hlsread *l)
+{
+ if (!l) return;
+
+ ffvec_free(&l->data);
+ ffstr *it;
+ FFSLICE_WALK(&l->q, it) {
+ ffstr_free(it);
+ }
+ ffvec_free(&l->q);
+ ffvec_free(&l->url);
+ core->timer(l->worker, &l->wait, 0, NULL, NULL);
+ ffmem_free(l);
+}
+
+/** Received new data chunk */
+static int hls_data(struct httpcl *h, ffstr data)
+{
+ struct hlsread *l = h->hls;
+ if (!l->data_file) {
+ ffvec_addstr(&l->data, &data);
+ return 1;
+ }
+ return 0;
+}
+
+/** Retrieve new data files from m3u list.
+Return 0 if something was added */
+static int hls_q_update(struct httpcl *h, ffstr d)
+{
+ struct hlsread *l = h->hls;
+ dbglog(h->trk, "m3u content: %S", &d);
+
+ int n = 0;
+ ffstr ln, s;
+ uint64 seq = 0;
+ while (d.len) {
+ ffstr_splitby(&d, '\n', &ln, &d);
+ ffstr_rskipchar1(&ln, '\r');
+
+ if (ffstr_matchz(&ln, "#")) {
+ if (ffstr_matchz(&ln, "#EXT-X-MEDIA-SEQUENCE:")) {
+ s = ln;
+ ffstr_shift(&s, FFS_LEN("#EXT-X-MEDIA-SEQUENCE:"));
+ if (!ffstr_to_uint64(&s, &seq))
+ warnlog(h->trk, "incorrect '#EXT-X-MEDIA-SEQUENCE' value: %S", &ln);
+ }
+ continue;
+ }
+
+ if (l->seq_last < seq) {
+ l->seq_last = seq;
+ ffstr *ps = ffvec_zpushT(&l->q, ffstr);
+ ffstr_dupstr(ps, &ln);
+ n++;
+ }
+ seq++;
+ }
+ return !n;
+}
+
+/** Get the first data file from the queue.
+name: User must free the value with ffstr_free() */
+static int hls_q_get(struct httpcl *h, ffstr *name)
+{
+ struct hlsread *l = h->hls;
+ if (!l->q.len)
+ return -1;
+
+ *name = *ffslice_itemT(&l->q, 0, ffstr);
+ ffslice_rmT((ffslice*)&l->q, 0, 1, ffstr);
+ dbglog(h->trk, "playing data file %S [%L]"
+ , name, l->q.len);
+ return 0;
+}
+
+/** Request file from server */
+static void hls_f_request(struct httpcl *h, ffstr name)
+{
+ struct hlsread *l = h->hls;
+ nml_http_client_free(h->cl);
+ ffstr_free(&h->conf.headers);
+ ffmem_zero_obj(&h->conf);
+
+ h->cl = nml_http_client_create();
+
+ struct nml_http_client_conf *c = &h->conf;
+ ffstr url = FFSTR_Z(h->trk->conf.ifile.name);
+ l->data_file = 0;
+ if (name.len) {
+ l->url.len = 0;
+ ffvec_addfmt(&l->url, "%S/%S", &l->base_url, &name);
+ ffstr_free(&name);
+ url = *(ffstr*)&l->url;
+ l->data_file = 1;
+ }
+
+ conf_prepare(h, c, h->trk, url);
+ dbglog(h->trk, "requesting %S", &url);
+ nml_http_client_conf(h->cl, c);
+ nml_http_client_run(h->cl);
+}
+
+static void hls_f_next(void *param)
+{
+ struct httpcl *h = param;
+ ffstr name = {};
+ hls_q_get(h, &name);
+
+ if (ffstr_matchz(&name, "http://")
+ || ffstr_matchz(&name, "https://")) {
+ errlog(h->trk, "expecting relative file name: '%S'", &name);
+ if (FF_SWAP(&h->state, ST_ERR) == ST_WAIT)
+ core->track->wake(h->trk);
+ return;
+ }
+
+ hls_f_request(h, name);
+}
+
+/** HTTP request is complete */
+static int hls_f_complete(struct httpcl *h)
+{
+ struct hlsread *l = h->hls;
+ if (!l->data_file) {
+ int r = hls_q_update(h, *(ffstr*)&l->data);
+ l->data.len = 0;
+ if (r) {
+ if (!l->seq_last
+ || l->n_fail_tries == 10) {
+ errlog(h->trk, "no more files in m3u");
+ return -1;
+ }
+
+ l->data_file = 0;
+ dbglog(h->trk, "no new files in m3u, waiting");
+ l->n_fail_tries++;
+ core->timer(l->worker, &l->wait, -2000, hls_f_next, h);
+ return 0;
+ }
+
+ l->n_fail_tries = 0;
+ }
+
+ core->task(l->worker, &l->task, hls_f_next, h);
+ return 0;
+}
diff --git a/src/net/http-filters.c b/src/net/http-filters.c
index 714fb1e..fb2c905 100644
--- a/src/net/http-filters.c
+++ b/src/net/http-filters.c
@@ -2,6 +2,7 @@
#include
#include
+#include
#include
#include
#include
@@ -47,6 +48,7 @@ static const nml_http_cl_component nml_http_cl_phi_bridge = {
const nml_http_cl_component *hc_chain[] = {
&nml_http_cl_resolve,
+ &nml_http_cl_connection_cache,
&nml_http_cl_connect,
&nml_http_cl_request,
&nml_http_cl_send,
@@ -67,6 +69,7 @@ const nml_http_cl_component *hc_chain[] = {
#include
const nml_http_cl_component *hc_ssl_chain[] = {
&nml_http_cl_resolve,
+ &nml_http_cl_connection_cache,
&nml_http_cl_connect,
&nml_htcl_ssl_recv,
&nml_htcl_ssl_handshake,
diff --git a/src/net/http.c b/src/net/http.c
index 9b2fc7e..b068adc 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -8,26 +8,35 @@
#include
#include
#include
+#include
const phi_core *core;
extern const phi_filter phi_icy;
#ifndef PHI_HTTP_NO_SSL
static struct nml_ssl_ctx *phi_ssl_ctx;
#endif
-#define errlog(t, ...) phi_errlog(core, "http-client", t, __VA_ARGS__)
-#define warnlog(t, ...) phi_warnlog(core, "http-client", t, __VA_ARGS__)
+#define MOD_NAME "http-client"
+#define errlog(t, ...) phi_errlog(core, MOD_NAME, t, __VA_ARGS__)
+#define warnlog(t, ...) phi_warnlog(core, MOD_NAME, t, __VA_ARGS__)
+#define dbglog(t, ...) phi_dbglog(core, MOD_NAME, t, __VA_ARGS__)
struct httpcl {
nml_http_client *cl;
struct nml_http_client_conf conf;
phi_track *trk;
ffvec path;
+ nml_cache_ctx *conn_cache;
+
+ ffring *buf;
+ ffring_head rhead;
ffstr data;
uint state; // enum ST
- uint fstate;
+ uint cl_state;
uint done :1;
uint icy :1;
+
+ struct hlsread *hls;
};
enum ST {
@@ -35,8 +44,13 @@ enum ST {
ST_WAIT,
ST_DATA,
ST_ERR,
+ ST_HLS_HAVE_DATA,
+ ST_HLS_PROCESSING,
};
+static int conf_prepare(struct httpcl *h, struct nml_http_client_conf *c, phi_track *t, ffstr url);
+#include
+
static void nml_log(void *log_obj, uint level, const char *ctx, const char *id, const char *format, ...)
{
struct httpcl *h = log_obj;
@@ -55,7 +69,7 @@ static void nml_log(void *log_obj, uint level, const char *ctx, const char *id,
va_list va;
va_start(va, format);
- core->conf.logv(core->conf.log_obj, level, NULL, h->trk, format, va);
+ core->conf.logv(core->conf.log_obj, level, MOD_NAME, h->trk, format, va);
va_end(va);
}
@@ -100,6 +114,7 @@ static fftime nmlcore_date(void *boss, ffstr *dts)
return t;
}
+/** Bridge between netmill and phiola Core */
static const struct nml_core nmlcore = {
.kev_new = nmlcore_kev_new,
.kev_free = nmlcore_kev_free,
@@ -109,6 +124,7 @@ static const struct nml_core nmlcore = {
.date = nmlcore_date,
};
+/** Received HTTP response headers */
int phi_hc_resp(void *ctx, struct phi_http_data *d)
{
struct httpcl *h = ctx;
@@ -118,39 +134,97 @@ int phi_hc_resp(void *ctx, struct phi_http_data *d)
return NMLR_ERR;
}
- static const struct map_sz_vptr ct_ext[] = {
+ static const struct map_sz24_vptr ct_ext[] = {
{ "application/ogg", "ogg" },
+ { "application/x-mpegURL", "m3u" },
{ "audio/aac", "aac" },
{ "audio/aacp", "aac" },
{ "audio/mpeg", "mp3" },
{ "audio/ogg", "ogg" },
};
- h->trk->data_type = map_sz_vptr_findstr(ct_ext, FF_COUNT(ct_ext), d->ct); // help format.detector in case it didn't detect format
+ h->trk->data_type = map_sz24_vptr_findstr(ct_ext, FF_COUNT(ct_ext), d->ct); // help format.detector in case it didn't detect format
+ if (!h->trk->data_type
+ && ffstr_eqz(&d->ct, "application/vnd.apple.mpegurl")
+ && !h->hls) {
+ h->hls = hls_new(h);
+ size_t cap = (h->trk->conf.ifile.buf_size) ? h->trk->conf.ifile.buf_size : 64*1024;
+ h->buf = ffring_alloc(cap, FFRING_1_READER | FFRING_1_WRITER);
+ }
- h->trk->icy_meta_interval = d->icy_meta_interval;
- h->icy = !!d->icy_meta_interval;
- h->trk->meta_changed = !d->icy_meta_interval;
+ if (!h->hls) {
+ h->trk->icy_meta_interval = d->icy_meta_interval;
+ h->icy = !!d->icy_meta_interval;
+ h->trk->meta_changed = !d->icy_meta_interval;
+ }
return NMLR_OPEN;
}
+enum {
+ CLST_RECEIVING,
+ CLST_PROCESSING,
+};
+
+static inline ffsize _ffring_writestr(ffring *b, ffstr data, ffsize *free)
+{
+ ffstr d;
+ ffring_head wh = ffring_write_begin(b, data.len, &d, free);
+ if (d.len == 0)
+ return 0;
+
+ ffmem_copy(d.ptr, data.ptr, d.len);
+ ffring_write_finish(b, wh, NULL);
+ return d.len;
+}
+
+/** New data chunk is available for reading */
int phi_hc_data(void *ctx, ffstr data, uint flags)
{
struct httpcl *h = ctx;
+ int r;
+
+ if (h->hls) {
+ switch (h->cl_state) {
+ case CLST_RECEIVING:
+ h->done = !!(flags & 1);
+ if (hls_data(h, data))
+ return (flags & 1) ? NMLR_FIN : NMLR_BACK;
+
+ h->data = data;
+ h->cl_state = CLST_PROCESSING;
+ // fallthrough
+
+ case CLST_PROCESSING: {
+ size_t nfree;
+ r = _ffring_writestr(h->buf, h->data, &nfree);
+ dbglog(h->trk, "buffer:%L", h->buf->cap - nfree);
+ ffstr_shift(&h->data, r);
+ if (FF_SWAP(&h->state, ST_HLS_HAVE_DATA) == ST_WAIT)
+ core->track->wake(h->trk);
+
+ if (h->data.len)
+ return NMLR_ASYNC;
+ h->cl_state = CLST_RECEIVING;
+ return (flags & 1) ? NMLR_FIN : NMLR_BACK;
+ }
+ }
- switch (h->fstate) {
- case 0:
+ return NMLR_ERR;
+ }
+
+ switch (h->cl_state) {
+ case CLST_RECEIVING:
h->data = data;
h->done = !!(flags & 1);
if (FF_SWAP(&h->state, ST_DATA) == ST_WAIT) {
core->track->wake(h->trk);
- h->fstate = 1;
+ h->cl_state = CLST_PROCESSING;
}
return NMLR_ASYNC;
- case 1:
- h->fstate = 0;
- return NMLR_BACK;
+ case CLST_PROCESSING:
+ h->cl_state = CLST_RECEIVING;
+ return (flags & 1) ? NMLR_FIN : NMLR_BACK;
}
return NMLR_ERR;
}
@@ -158,6 +232,11 @@ int phi_hc_data(void *ctx, ffstr data, uint flags)
static void on_complete(void *param)
{
struct httpcl *h = param;
+
+ if (h->hls
+ && !hls_f_complete(h))
+ return;
+
if (FF_SWAP(&h->state, ST_ERR) == ST_WAIT)
core->track->wake(h->trk);
}
@@ -165,6 +244,7 @@ static void on_complete(void *param)
extern const nml_http_cl_component
*hc_chain[],
*hc_ssl_chain[];
+extern const struct nml_cache_if nml_cache_interface;
#ifndef PHI_HTTP_NO_SSL
#include
@@ -202,7 +282,31 @@ static struct nml_ssl_ctx* ssl_prepare(struct nml_http_client_conf *c)
}
#endif
-static int conf_prepare(struct httpcl *h, struct nml_http_client_conf *c, phi_track *t)
+static nml_cache_ctx* conn_cache_new(struct httpcl *h)
+{
+ struct nml_cache_conf *cc = ffmem_new(struct nml_cache_conf);
+ nml_cache_interface.conf(NULL, cc);
+
+ if (core->conf.log_level >= PHI_LOG_EXTRA)
+ cc->log_level = NML_LOG_EXTRA;
+ else if (core->conf.log_level >= PHI_LOG_DEBUG)
+ cc->log_level = NML_LOG_DEBUG;
+ cc->log = nml_log;
+ cc->log_obj = h;
+
+ cc->max_items = 2;
+ cc->ttl_sec = 30;
+ cc->destroy = nml_http_cl_conn_cache_destroy;
+ cc->opaque = NULL;
+
+ nml_cache_ctx *cx = nml_cache_interface.create();
+ if (!cx)
+ return NULL;
+ nml_cache_interface.conf(cx, cc);
+ return cx;
+}
+
+static int conf_prepare(struct httpcl *h, struct nml_http_client_conf *c, phi_track *t, ffstr url)
{
nml_http_client_conf(NULL, c);
c->opaque = h;
@@ -219,8 +323,11 @@ static int conf_prepare(struct httpcl *h, struct nml_http_client_conf *c, phi_tr
c->core = nmlcore;
c->boss = h;
+ c->connect.cache = h->conn_cache;
+ c->connect.cif = &nml_cache_interface;
+
struct httpurl_parts p = {};
- httpurl_split(&p, FFSTR_Z(h->trk->conf.ifile.name));
+ httpurl_split(&p, url);
c->host = p.host;
c->host.len += p.port.len;
if (!p.port.len)
@@ -254,7 +361,7 @@ static int conf_prepare(struct httpcl *h, struct nml_http_client_conf *c, phi_tr
ffsize headers_cap = 0;
ffstr_growaddz(&c->headers, &headers_cap, "User-Agent: phiola/2\r\n");
- if (!t->conf.ifile.no_meta)
+ if (!t->conf.ifile.no_meta && !h->hls)
ffstr_growaddz(&c->headers, &headers_cap, "Icy-MetaData: 1\r\n");
if (t->conf.ifile.connect_timeout_sec)
@@ -269,10 +376,12 @@ static void* httpcl_open(phi_track *t)
{
struct httpcl *h = phi_track_allocT(t, struct httpcl);
h->trk = t;
+ h->conn_cache = conn_cache_new(h);
+
h->cl = nml_http_client_create();
struct nml_http_client_conf *c = &h->conf;
- if (conf_prepare(h, c, t))
+ if (conf_prepare(h, c, t, FFSTR_Z(t->conf.ifile.name)))
return PHI_OPEN_ERR;
nml_http_client_conf(h->cl, c);
h->state = ST_PROCESSING;
@@ -288,6 +397,9 @@ static void httpcl_close(struct httpcl *h, phi_track *t)
nml_http_client_free(h->cl);
ffvec_free(&h->path);
ffstr_free(&h->conf.headers);
+ hls_free(h, h->hls);
+ ffring_free(h->buf);
+ nml_cache_interface.destroy(h->conn_cache);
phi_track_free(t, h);
}
@@ -315,6 +427,23 @@ static int httpcl_process(struct httpcl *h, phi_track *t)
nml_http_client_run(h->cl);
return PHI_ASYNC;
+ case ST_HLS_HAVE_DATA:
+ h->rhead = ffring_read_begin(h->buf, h->buf->cap, &t->data_out, NULL);
+ h->state = ST_HLS_PROCESSING;
+ return PHI_DATA;
+
+ case ST_HLS_PROCESSING: {
+ h->state = ST_WAIT;
+
+ size_t used;
+ ffring_read_finish_status(h->buf, h->rhead, &used);
+ dbglog(h->trk, "buffer:%L", used - (h->rhead.nu - h->rhead.old));
+
+ if (h->cl_state == CLST_PROCESSING)
+ nml_http_client_run(h->cl);
+ return PHI_ASYNC;
+ }
+
case ST_ERR:
default:
return PHI_ERR;
diff --git a/src/util/util.h b/src/util/util.h
index bb38321..e9e69e0 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -121,6 +121,19 @@ static inline const void* map_sz_vptr_findstr(const struct map_sz_vptr *m, ffsiz
}
+struct map_sz24_vptr {
+ char key[24];
+ const void *val;
+};
+static inline const void* map_sz24_vptr_findstr(const struct map_sz24_vptr *m, ffsize n, ffstr name)
+{
+ ffssize i = ffcharr_findsorted_padding(m, n, sizeof(m->key), sizeof(m->val), name.ptr, name.len);
+ if (i < 0)
+ return NULL;
+ return m[i].val;
+}
+
+
static inline int url_checkz(const char *s)
{
return (ffsz_matchz(s, "http://")
diff --git a/test.sh b/test.sh
index 45540e4..49b7353 100644
--- a/test.sh
+++ b/test.sh
@@ -590,7 +590,9 @@ test_http() {
fi
./phiola pl "http://localhost:1/" || true # no connection
+ # echo 'application/vnd.apple.mpegurl m3u8' >> $(dirname $(which netmill))/content-types.conf
netmill http l 8080 w . &
+ local nml_pid=$!
sleep .5
./phiola pl "http://localhost:8080/404" || true # http error
@@ -602,16 +604,31 @@ test_http() {
./phiola pl "http://localhost:8080/http.m3u"
# -tee
- ./phiola pl "http://localhost:8080/http.m3u" -tee @stdout.ogg >http-tee-stdout.ogg ; ./phiola http-tee-stdout.ogg
- ./phiola pl "http://localhost:8080/http.m3u" -tee http-tee.ogg ; ./phiola http-tee.ogg
- ./phiola pl "http://localhost:8080/http.m3u" -tee http-tee.ogg # file already exists
- ./phiola pl "http://localhost:8080/http.m3u" -tee http-@title.ogg ; ./phiola http-mytrack.ogg
+ ./phiola pl "http://localhost:8080/http.ogg" -tee @stdout.ogg >http-tee-stdout.ogg ; ./phiola http-tee-stdout.ogg
+ ./phiola pl "http://localhost:8080/http.ogg" -tee http-tee.ogg ; ./phiola http-tee.ogg
+ ./phiola pl "http://localhost:8080/http.ogg" -tee http-tee.ogg # file already exists
+ # ./phiola pl "http://localhost:8080/http.ogg" -tee http-@title.ogg ; ./phiola http-mytrack.ogg
# -dup
./phiola pl "http://localhost:8080/http.mp3" -dup @stdout.wav >http-dup-stdout.wav ; ./phiola http-dup-stdout.wav
./phiola pl "http://localhost:8080/http.mp3" -dup http-dup-@title.wav ; ./phiola http-dup-mytrack.wav
+ # HLS
+ cp http.ogg hls1.ogg
+ cp http.ogg hls2.ogg
+ cp http.ogg hls3.ogg
+ cat <hls.m3u8
+#EXTM3U
+#EXT-X-MEDIA-SEQUENCE:1
+hls1.ogg
+hls2.ogg
+hls3.ogg
+EOF
+ ./phiola pl "http://localhost:8080/hls.m3u8" &
+ sleep 10
kill $!
+
+ kill $nml_pid
}
test_ofile_vars() {
From 0e57287748a205da4dab4e6f20c5363d8a417979 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 09:49:08 +0300
Subject: [PATCH 14/59] - `-dup` option didn't work sometimes
---
src/tui/play.h | 6 ++++--
src/tui/tui.c | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/tui/play.h b/src/tui/play.h
index 93a59ae..3cd3360 100644
--- a/src/tui/play.h
+++ b/src/tui/play.h
@@ -182,6 +182,7 @@ static int handle_seek(tui_track *u, phi_track *t)
return PHI_MORE; // new seek request
} else if (!(t->chain_flags & PHI_FFWD)) {
+ t->meta_changed = 0;
return PHI_MORE; // going back without seeking
} else if (t->data_in.len == 0 && !(t->chain_flags & PHI_FFIRST)) {
@@ -203,14 +204,15 @@ static int tuiplay_process(void *ctx, phi_track *t)
if (t->chain_flags & PHI_FSTOP)
return PHI_FIN;
- if (u->show_info || t->meta_changed) {
+ uint new_meta = (t->meta_changed && !u->meta_change_seen);
+ u->meta_change_seen = t->meta_changed;
+ if (u->show_info || new_meta) {
if (!t->audio.format.rate) {
errlog(t, "audio sample rate is not set");
return PHI_ERR;
}
u->show_info = 0;
- t->meta_changed = 0;
u->total_samples = t->audio.total;
u->played_samples = 0;
tui_info(u);
diff --git a/src/tui/tui.c b/src/tui/tui.c
index 0288c49..0718ba9 100644
--- a/src/tui/tui.c
+++ b/src/tui/tui.c
@@ -30,6 +30,7 @@ typedef struct tui_track {
ffvec buf;
uint nback;
uint show_info :1;
+ uint meta_change_seen :1;
uint paused :1;
} tui_track;
From 03ffd6f868d3057e23211f103f140e4f6103c660 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 09:49:08 +0300
Subject: [PATCH 15/59] + read .ts(AAC) streams
---
README.md | 2 +-
src/format/Makefile | 1 +
src/format/mod-fmt.c | 3 +
src/format/ts-read.c | 127 +++++++++++++++++++++++++++++++++++++++++++
src/net/http.c | 1 +
5 files changed, 133 insertions(+), 1 deletion(-)
create mode 100644 src/format/ts-read.c
diff --git a/README.md b/README.md
index 9ba3058..7706b01 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Contents:
## Features
-* Play audio: `.mp3`, `.ogg`(Vorbis/Opus), `.mp4`/`.mov`(AAC/ALAC/MPEG), `.mkv`/`.webm`(AAC/ALAC/MPEG/Vorbis/Opus/PCM), `.caf`(AAC/ALAC/PCM), `.avi`(AAC/MPEG/PCM), `.aac`, `.mpc`; `.flac`, `.ape`, `.wv`, `.wav`.
+* Play audio: `.mp3`, `.ogg`(Vorbis/Opus), `.mp4`/`.mov`(AAC/ALAC/MPEG), `.mkv`/`.webm`(AAC/ALAC/MPEG/Vorbis/Opus/PCM), `.caf`(AAC/ALAC/PCM), `.avi`(AAC/MPEG/PCM), `.ts`(AAC), `.aac`, `.mpc`; `.flac`, `.ape`, `.wv`, `.wav`.
* Record audio: `.m4a`(AAC), `.ogg`, `.opus`; `.flac`, `.wav`
* Convert audio
* List/search file meta tags; edit MP3 tags
diff --git a/src/format/Makefile b/src/format/Makefile
index 52be6a3..a55d839 100644
--- a/src/format/Makefile
+++ b/src/format/Makefile
@@ -33,6 +33,7 @@ format.$(SO): mod-fmt.o \
mp4.o \
mpc-read.o \
ogg.o \
+ ts-read.o \
wav.o \
wv.o \
\
diff --git a/src/format/mod-fmt.c b/src/format/mod-fmt.c
index 020f203..19b117c 100644
--- a/src/format/mod-fmt.c
+++ b/src/format/mod-fmt.c
@@ -33,6 +33,7 @@ extern const phi_filter
phi_mpc_read,
phi_ogg_read,
phi_opusmeta_read,
+ phi_ts_read,
phi_vorbismeta_read,
phi_wav_read,
phi_wv_read;
@@ -100,6 +101,7 @@ static const void* fmt_mod_iface_input(const char *name)
{ "ogg", &phi_ogg_read },
{ "opus", &phi_ogg_read },
{ "pls", &phi_pls_read },
+ { "ts", &phi_ts_read },
{ "wav", &phi_wav_read },
{ "wv", &phi_wv_read },
};
@@ -130,6 +132,7 @@ static const void* fmt_mod_iface(const char *name)
{ "opusmeta", &phi_opusmeta_read },
{ "pls", &phi_pls_read },
{ "tag", &phi_tag },
+ { "ts", &phi_ts_read },
{ "vorbismeta", &phi_vorbismeta_read },
{ "wav", &phi_wav_read },
{ "wav-write", &phi_wav_write },
diff --git a/src/format/ts-read.c b/src/format/ts-read.c
new file mode 100644
index 0000000..d583651
--- /dev/null
+++ b/src/format/ts-read.c
@@ -0,0 +1,127 @@
+/** phiola: .ts reader
+2024, Simon Zolin */
+
+#include
+#include
+#include
+#include
+
+extern const phi_core *core;
+#define errlog(t, ...) phi_errlog(core, NULL, t, __VA_ARGS__)
+#define dbglog(t, ...) phi_dbglog(core, NULL, t, __VA_ARGS__)
+
+struct ts_r {
+ tsread ts;
+ ffstr in;
+ uint track_id;
+ uint64 n_pkt;
+ uint64 pos_start_msec;
+ void *trk;
+};
+
+static void ts_log(void *udata, const char *fmt, va_list va)
+{
+ struct ts_r *c = udata;
+ phi_dbglogv(core, NULL, c->trk, fmt, va);
+}
+
+static void* ts_open(phi_track *t)
+{
+ struct ts_r *c = phi_track_allocT(t, struct ts_r);
+ c->trk = t;
+ c->pos_start_msec = ~0ULL;
+ uint64 tsize = (t->input.size != ~0ULL) ? t->input.size : 0;
+ tsread_open(&c->ts, tsize);
+ c->ts.log = ts_log;
+ c->ts.udata = c;
+ return c;
+}
+
+static void ts_close(void *ctx, phi_track *t)
+{
+ struct ts_r *c = ctx;
+ tsread_close(&c->ts);
+ phi_track_free(t, c);
+}
+
+static int ts_info(struct ts_r *c, phi_track *t, const struct _tsr_pm *info)
+{
+ const char *mod;
+ switch (info->stream_type) {
+ case TS_STREAM_AUDIO_AAC:
+ mod = "format.aac"; break;
+ default:
+ dbglog(t, "codec not supported: %u", info->stream_type);
+ return 1;
+ }
+ if (!core->track->filter(t, core->mod(mod), 0))
+ return -1;
+
+ c->track_id = info->pid;
+ return 0;
+}
+
+static int ts_process(void *ctx, phi_track *t)
+{
+ struct ts_r *c = ctx;
+ int r;
+ ffstr pkt;
+
+ if (t->chain_flags & PHI_FSTOP) {
+ return PHI_LASTOUT;
+ }
+
+ if (t->data_in.len) {
+ c->in = t->data_in;
+ t->data_in.len = 0;
+ }
+
+ for (;;) {
+ r = tsread_process(&c->ts, &c->in, &pkt);
+
+ switch (r) {
+
+ case TSREAD_DATA:
+ if (c->n_pkt == 0) {
+ // select the first audio track with a recognized codec
+ r = ts_info(c, t, tsread_info(&c->ts));
+ if (r < 0)
+ return PHI_ERR;
+ else if (r > 0)
+ continue;
+ }
+
+ if (c->track_id != tsread_info(&c->ts)->pid)
+ continue;
+
+ goto data;
+
+ case TSREAD_MORE:
+ return PHI_MORE;
+
+ // case TSREAD_DONE:
+ // return PHI_LASTOUT;
+
+ case TSREAD_ERROR:
+ errlog(t, "tsread_process(): %s. Offset: %U"
+ , tsread_error(&c->ts), tsread_offset(&c->ts));
+ return PHI_ERR;
+ }
+ }
+
+data:
+ if (c->pos_start_msec == ~0ULL)
+ c->pos_start_msec = tsread_pos_msec(&c->ts);
+ if (t->audio.format.rate)
+ t->audio.pos = msec_to_samples(tsread_pos_msec(&c->ts) - c->pos_start_msec, t->audio.format.rate);
+ dbglog(t, "frame#%U passing %L bytes @%U"
+ , c->n_pkt, pkt.len, t->audio.pos);
+ c->n_pkt++;
+ t->data_out = pkt;
+ return PHI_DATA;
+}
+
+const phi_filter phi_ts_read = {
+ ts_open, (void*)ts_close, (void*)ts_process,
+ "ts-read"
+};
diff --git a/src/net/http.c b/src/net/http.c
index b068adc..b3a5be8 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -141,6 +141,7 @@ int phi_hc_resp(void *ctx, struct phi_http_data *d)
{ "audio/aacp", "aac" },
{ "audio/mpeg", "mp3" },
{ "audio/ogg", "ogg" },
+ { "video/MP2T", "ts" },
};
h->trk->data_type = map_sz24_vptr_findstr(ct_ext, FF_COUNT(ct_ext), d->ct); // help format.detector in case it didn't detect format
if (!h->trk->data_type
From 0a9f793fa78f8f17ba088208df382e48f5ea9eca Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 09:49:08 +0300
Subject: [PATCH 16/59] minor
---
Makefile | 3 ---
src/core/Makefile | 3 +++
src/exe/main.c | 11 +++++++++++
src/gui/windows.c | 11 +++++++++++
src/list/m3u-read.h | 5 ++++-
src/net/http.c | 11 +----------
6 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index 4693c6a..3250bc3 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,6 @@ ifeq "$(ASAN)" "1"
CFLAGS += -fsanitize=address
LINKFLAGS += -fsanitize=address
endif
-ifdef PHI_VERSION_STR
- CFLAGS += -DPHI_VERSION_STR=\"$(PHI_VERSION_STR)\"
-endif
CFLAGS += $(CFLAGS_USER)
CFLAGS_BASE := $(CFLAGS)
CFLAGS += -I$(PHIOLA)/src -I$(FFSYS)
diff --git a/src/core/Makefile b/src/core/Makefile
index d4c0b4a..66cf61a 100644
--- a/src/core/Makefile
+++ b/src/core/Makefile
@@ -35,6 +35,9 @@ libphiola.$(SO): $(CORE_O)
$(LINK) -shared $+ $(LINKFLAGS_CORE) $(LINK_PTHREAD) $(LINK_DL) -o $@
CFLAGS_CORE := $(CFLAGS) -DFFBASE_OPT_SIZE
+ifdef PHI_VERSION_STR
+ CFLAGS_CORE += -DPHI_VERSION_STR=\"$(PHI_VERSION_STR)\"
+endif
%.o: $(PHIOLA)/src/core/%.c
$(C) $(CFLAGS_CORE) $< -o $@
%.o: $(PHIOLA)/src/jni/%.c
diff --git a/src/exe/main.c b/src/exe/main.c
index da6ee25..aef841d 100644
--- a/src/exe/main.c
+++ b/src/exe/main.c
@@ -221,6 +221,16 @@ static char* mod_loading(ffstr name)
, &x->root_dir, FFPATH_SLASH, &name, FFDL_EXT);
}
+static ffstr resource_load(const char *name)
+{
+ char *fn = ffsz_allocfmt("%Smod%c%s"
+ , &x->root_dir, FFPATH_SLASH, name);
+ ffvec d = {};
+ fffile_readwhole(fn, &d, 100*1024*1024);
+ ffmem_free(fn);
+ return *(ffstr*)&d;
+}
+
static int core()
{
struct phi_core_conf conf = {
@@ -231,6 +241,7 @@ static int core()
.env_expand = env_expand,
.mod_loading = mod_loading,
+ .resource_load = resource_load,
.workers = x->workers,
.cpu_affinity = x->cpu_affinity,
diff --git a/src/gui/windows.c b/src/gui/windows.c
index 0f82f40..04b6a5f 100644
--- a/src/gui/windows.c
+++ b/src/gui/windows.c
@@ -155,6 +155,16 @@ static char* mod_loading(ffstr name)
, &x->root_dir, FFPATH_SLASH, &name, FFDL_EXT);
}
+static ffstr resource_load(const char *name)
+{
+ char *fn = ffsz_allocfmt("%Smod%c%s"
+ , &x->root_dir, FFPATH_SLASH, name);
+ ffvec d = {};
+ fffile_readwhole(fn, &d, 100*1024*1024);
+ ffmem_free(fn);
+ return *(ffstr*)&d;
+}
+
static int core()
{
struct phi_core_conf conf = {
@@ -165,6 +175,7 @@ static int core()
.env_expand = env_expand,
.mod_loading = mod_loading,
+ .resource_load = resource_load,
.workers = ~0U,
.io_workers = ~0U,
diff --git a/src/list/m3u-read.h b/src/list/m3u-read.h
index dd3095a..14909f0 100644
--- a/src/list/m3u-read.h
+++ b/src/list/m3u-read.h
@@ -102,7 +102,7 @@ static int m3u_process(void *ctx, phi_track *t)
r = m3uread_process(&m->m3u, &data, &val);
- switch (r) {
+ switch ((enum M3UREAD_R)r) {
case M3UREAD_MORE:
if (!(t->chain_flags & PHI_FFIRST)) {
_ffvec_copyself(&m->pls_ent.artist);
@@ -140,6 +140,9 @@ static int m3u_process(void *ctx, phi_track *t)
warnlog(t, "parse error: %s", m3uread_error(&m->m3u));
continue;
+ case M3UREAD_EXT:
+ continue;
+
default:
FF_ASSERT(0);
return PHI_ERR;
diff --git a/src/net/http.c b/src/net/http.c
index b3a5be8..5cedee2 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -255,17 +255,9 @@ static struct nml_ssl_ctx* ssl_prepare(struct nml_http_client_conf *c)
struct ffssl_ctx_conf *scc = ffmem_new(struct ffssl_ctx_conf);
sc->ctx_conf = scc;
- char *cert_file = NULL;
- ffstr cert_data = {};
-#ifdef FF_ANDROID
- cert_data = core->conf.resource_load("http-client.pem");
+ ffstr cert_data = core->conf.resource_load("http-client.pem");
scc->cert_data = cert_data;
scc->pkey_data = cert_data;
-#else
- cert_file = ffsz_allocfmt("%S/mod/http-client.pem", &core->conf.root);
- scc->cert_file = cert_file;
- scc->pkey_file = cert_file;
-#endif
sc->log_level = c->log_level;
sc->log_obj = c->log_obj;
@@ -278,7 +270,6 @@ static struct nml_ssl_ctx* ssl_prepare(struct nml_http_client_conf *c)
}
ffstr_free(&cert_data);
- ffmem_free(cert_file);
return sc;
}
#endif
From db29df02e10aedba8fc118c557e3bc681a48aae6 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 09:49:08 +0300
Subject: [PATCH 17/59] rename modules
---
src/acodec/Makefile | 38 ++++++++++++++++++++------------------
src/format/aac-read.h | 2 +-
src/format/ape-read.c | 2 +-
src/format/avi.c | 2 +-
src/format/caf.c | 2 +-
src/format/flac-ogg.c | 2 +-
src/format/flac-read.h | 2 +-
src/format/flac-write.h | 2 +-
src/format/mkv.c | 2 +-
src/format/mp3-read.h | 2 +-
src/format/mp3-write.h | 2 +-
src/format/mp4-read.h | 6 +++---
src/format/mp4-write.h | 2 +-
src/format/mpc-read.c | 2 +-
src/format/ogg-read.h | 4 ++--
src/format/ogg-write.h | 4 ++--
src/format/wv.c | 2 +-
17 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/src/acodec/Makefile b/src/acodec/Makefile
index be6b480..b99ddae 100644
--- a/src/acodec/Makefile
+++ b/src/acodec/Makefile
@@ -21,68 +21,70 @@ AVPACK := $(ROOT_DIR)/avpack
ALIB3 := $(PHIOLA)/alib3
ALIB3_BIN := $(ALIB3)/_$(SYS)-$(CPU)
+PFX := ac-
+
# LOSSY
%.o: $(PHIOLA)/src/acodec/%.c
$(C) $(CFLAGS) -I$(ALIB3) $< -o $@
-MODS += aac.$(SO)
+MODS += $(PFX)aac.$(SO)
LIBS3 += $(ALIB3_BIN)/libfdk-aac-phi.$(SO)
-aac.$(SO): aac.o
+$(PFX)aac.$(SO): aac.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lfdk-aac-phi -o $@
-MODS += mpeg.$(SO)
+MODS += $(PFX)mpeg.$(SO)
LIBS3 += $(ALIB3_BIN)/libmpg123-phi.$(SO)
-mpeg.$(SO): mpeg.o
+$(PFX)mpeg.$(SO): mpeg.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lmpg123-phi -o $@
-MODS += vorbis.$(SO)
+MODS += $(PFX)vorbis.$(SO)
LIBS3 += $(ALIB3_BIN)/libvorbis-phi.$(SO) $(ALIB3_BIN)/libvorbisenc-phi.$(SO)
vorbis.o: $(PHIOLA)/src/acodec/vorbis.c
$(C) $(CFLAGS) -I$(ALIB3) -I$(AVPACK) $< -o $@
-vorbis.$(SO): vorbis.o
+$(PFX)vorbis.$(SO): vorbis.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lvorbis-phi -lvorbisenc-phi -o $@
-MODS += opus.$(SO)
+MODS += $(PFX)opus.$(SO)
LIBS3 += $(ALIB3_BIN)/libopus-phi.$(SO)
opus.o: $(PHIOLA)/src/acodec/opus.c
$(C) $(CFLAGS) -I$(ALIB3) -I$(AVPACK) $< -o $@
-opus.$(SO): opus.o
+$(PFX)opus.$(SO): opus.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lopus-phi -o $@
ifneq "$(SYS)" "android"
-MODS += mpc.$(SO)
+MODS += $(PFX)mpc.$(SO)
LIBS3 += $(ALIB3_BIN)/libmusepack-phi.$(SO)
endif
-mpc.$(SO): mpc.o
+$(PFX)mpc.$(SO): mpc.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lmusepack-phi -o $@
# LOSSLESS
-MODS += alac.$(SO)
+MODS += $(PFX)alac.$(SO)
LIBS3 += $(ALIB3_BIN)/libALAC-phi.$(SO)
-alac.$(SO): alac.o
+$(PFX)alac.$(SO): alac.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lALAC-phi -o $@
ifneq "$(SYS)" "android"
-MODS += ape.$(SO)
+MODS += $(PFX)ape.$(SO)
LIBS3 += $(ALIB3_BIN)/libMAC-phi.$(SO)
endif
ape.o: $(PHIOLA)/src/acodec/ape.c
$(C) $(CFLAGS) -I$(ALIB3) -I$(AVPACK) $< -o $@
-ape.$(SO): ape.o
+$(PFX)ape.$(SO): ape.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lMAC-phi -o $@
-MODS += flac.$(SO)
+MODS += $(PFX)flac.$(SO)
LIBS3 += $(ALIB3_BIN)/libFLAC-phi.$(SO)
flac.o: $(PHIOLA)/src/acodec/flac.c
$(C) $(CFLAGS) -I$(ALIB3) -I$(AVPACK) $< -o $@
-flac.$(SO): flac.o
+$(PFX)flac.$(SO): flac.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lFLAC-phi -o $@
ifneq "$(SYS)" "android"
-MODS += wavpack.$(SO)
+MODS += $(PFX)wavpack.$(SO)
LIBS3 += $(ALIB3_BIN)/libwavpack-phi.$(SO)
endif
-wavpack.$(SO): wavpack.o
+$(PFX)wavpack.$(SO): wavpack.o
$(LINK) -shared $+ $(LINKFLAGS) $(LINK_RPATH_ORIGIN) -L$(ALIB3_BIN) -lwavpack-phi -o $@
diff --git a/src/format/aac-read.h b/src/format/aac-read.h
index c314f7f..ca33467 100644
--- a/src/format/aac-read.h
+++ b/src/format/aac-read.h
@@ -72,7 +72,7 @@ static int aac_adts_process(void *ctx, phi_track *t)
a->sample_rate = t->audio.format.rate;
if (!t->conf.stream_copy) {
- if (!core->track->filter(t, core->mod("aac.decode"), 0))
+ if (!core->track->filter(t, core->mod("ac-aac.decode"), 0))
return PHI_ERR;
}
diff --git a/src/format/ape-read.c b/src/format/ape-read.c
index 6629da0..f68ea29 100644
--- a/src/format/ape-read.c
+++ b/src/format/ape-read.c
@@ -88,7 +88,7 @@ static int ape_in_process(void *ctx, phi_track *t)
break;
case APEREAD_HEADER:
- if (!core->track->filter(t, core->mod("ape.decode"), 0))
+ if (!core->track->filter(t, core->mod("ac-ape.decode"), 0))
return PHI_ERR;
a->state = I_HDR_PARSED;
return PHI_DATA;
diff --git a/src/format/avi.c b/src/format/avi.c
index 377da7e..5b48e87 100644
--- a/src/format/avi.c
+++ b/src/format/avi.c
@@ -55,7 +55,7 @@ static const ushort avi_codecs[] = {
AVI_A_AAC, AVI_A_MP3,
};
static const char* const avi_codecs_str[] = {
- "aac.decode", "mpeg.decode",
+ "ac-aac.decode", "ac-mpeg.decode",
};
static const struct avi_audio_info* get_first_audio_track(struct avi_r *a)
diff --git a/src/format/caf.c b/src/format/caf.c
index 236f00b..04b0947 100644
--- a/src/format/caf.c
+++ b/src/format/caf.c
@@ -43,7 +43,7 @@ static const ffbyte caf_codecs[] = {
CAF_AAC, CAF_ALAC, CAF_LPCM,
};
static const char* const caf_codecs_str[] = {
- "aac.decode", "alac.decode", "",
+ "ac-aac.decode", "ac-alac.decode", "",
};
static int caf_process(void *ctx, phi_track *t)
diff --git a/src/format/flac-ogg.c b/src/format/flac-ogg.c
index 7ecbe0f..b03fcdb 100644
--- a/src/format/flac-ogg.c
+++ b/src/format/flac-ogg.c
@@ -107,7 +107,7 @@ static int flacogg_in_read(void *ctx, phi_track *t)
f->fr_samples = t->audio.flac_minblock;
- if (!core->track->filter(t, core->mod("flac.decode"), 0))
+ if (!core->track->filter(t, core->mod("ac-flac.decode"), 0))
return PHI_ERR;
break;
diff --git a/src/format/flac-read.h b/src/format/flac-read.h
index 08079e8..4d90697 100644
--- a/src/format/flac-read.h
+++ b/src/format/flac-read.h
@@ -123,7 +123,7 @@ static int flac_in_read(void *ctx, phi_track *t)
if (t->conf.info_only)
return PHI_LASTOUT;
- if (!core->track->filter(t, core->mod("flac.decode"), 0))
+ if (!core->track->filter(t, core->mod("ac-flac.decode"), 0))
return PHI_ERR;
break;
diff --git a/src/format/flac-write.h b/src/format/flac-write.h
index 29d9b99..c06ffec 100644
--- a/src/format/flac-write.h
+++ b/src/format/flac-write.h
@@ -125,7 +125,7 @@ static int flac_out_encode(void *ctx, phi_track *t)
switch (f->state) {
case I_FIRST:
- if (!core->track->filter(t, core->mod("flac.encode"), PHI_TF_PREV))
+ if (!core->track->filter(t, core->mod("ac-flac.encode"), PHI_TF_PREV))
return PHI_ERR;
f->state = I_INIT;
return PHI_MORE;
diff --git a/src/format/mkv.c b/src/format/mkv.c
index 28a6248..6fab61a 100644
--- a/src/format/mkv.c
+++ b/src/format/mkv.c
@@ -59,7 +59,7 @@ static const ushort mkv_codecs[] = {
MKV_A_AAC, MKV_A_ALAC, MKV_A_MPEGL3, MKV_A_OPUS, MKV_A_VORBIS, MKV_A_PCM,
};
static const char* const mkv_codecs_str[] = {
- "aac.decode", "alac.decode", "mpeg.decode", "opus.decode", "vorbis.decode", "",
+ "ac-aac.decode", "ac-alac.decode", "ac-mpeg.decode", "ac-opus.decode", "ac-vorbis.decode", "",
};
static const ushort mkv_vcodecs[] = {
MKV_V_AVC, MKV_V_HEVC,
diff --git a/src/format/mp3-read.h b/src/format/mp3-read.h
index e67fbfd..e1f203a 100644
--- a/src/format/mp3-read.h
+++ b/src/format/mp3-read.h
@@ -122,7 +122,7 @@ static int mp3_process(struct mp3_r *m, phi_track *t)
return PHI_LASTOUT;
if (!t->conf.stream_copy
- && !core->track->filter(t, core->mod("mpeg.decode"), 0))
+ && !core->track->filter(t, core->mod("ac-mpeg.decode"), 0))
return PHI_ERR;
break;
diff --git a/src/format/mp3-write.h b/src/format/mp3-write.h
index 8abd46d..ab9a98a 100644
--- a/src/format/mp3-write.h
+++ b/src/format/mp3-write.h
@@ -66,7 +66,7 @@ int mpeg_out_process(void *ctx, phi_track *t)
return PHI_ERR;
}
- if (!core->track->filter(t, core->mod("mpeg.encode"), PHI_TF_PREV)) {
+ if (!core->track->filter(t, core->mod("ac-mpeg.encode"), PHI_TF_PREV)) {
t->error = PHI_E_OUT_FMT;
return PHI_ERR;
}
diff --git a/src/format/mp4-read.h b/src/format/mp4-read.h
index be636bc..9786c9b 100644
--- a/src/format/mp4-read.h
+++ b/src/format/mp4-read.h
@@ -109,12 +109,12 @@ static const char* mp4r_info(struct mp4_r *m, phi_track *t, const struct mp4read
const char *filter = NULL;
switch (ai->codec) {
case MP4_A_ALAC:
- filter = "alac.decode";
+ filter = "ac-alac.decode";
t->audio.bitrate = ai->real_bitrate;
break;
case MP4_A_AAC:
- filter = "aac.decode";
+ filter = "ac-aac.decode";
if (!t->conf.stream_copy) {
t->audio.start_delay = ai->enc_delay;
t->audio.end_padding = ai->end_padding;
@@ -123,7 +123,7 @@ static const char* mp4r_info(struct mp4_r *m, phi_track *t, const struct mp4read
break;
case MP4_A_MPEG1:
- filter = "mpeg.decode";
+ filter = "ac-mpeg.decode";
t->audio.bitrate = (ai->aac_bitrate != 0) ? ai->aac_bitrate : 0;
break;
}
diff --git a/src/format/mp4-write.h b/src/format/mp4-write.h
index e7cc5b7..06d3ab3 100644
--- a/src/format/mp4-write.h
+++ b/src/format/mp4-write.h
@@ -61,7 +61,7 @@ static int mp4w_write(struct mp4_w *m, phi_track *t)
m->state = 1;
} else if (ffsz_eq(t->data_type, "pcm")) {
- if (!core->track->filter(t, core->mod("aac.encode"), PHI_TF_PREV))
+ if (!core->track->filter(t, core->mod("ac-aac.encode"), PHI_TF_PREV))
return PHI_ERR;
m->state = 1;
return PHI_MORE;
diff --git a/src/format/mpc-read.c b/src/format/mpc-read.c
index 800384d..069c3e5 100644
--- a/src/format/mpc-read.c
+++ b/src/format/mpc-read.c
@@ -89,7 +89,7 @@ static int mpc_process(void *ctx, phi_track *t)
case MPCREAD_HEADER:
mpc_info(m, t, mpcread_info(&m->mpc));
- if (!core->track->filter(t, core->mod("mpc.decode"), 0))
+ if (!core->track->filter(t, core->mod("ac-mpc.decode"), 0))
return PHI_ERR;
m->sample_rate = t->audio.format.rate;
diff --git a/src/format/ogg-read.h b/src/format/ogg-read.h
index f25134e..05cae3e 100644
--- a/src/format/ogg-read.h
+++ b/src/format/ogg-read.h
@@ -53,12 +53,12 @@ static int add_decoder(struct ogg_r *o, phi_track *t, ffstr data)
if (ffstr_matchz(&data, VORBIS_HEAD_STR)) {
meta_filter_name = "format.vorbismeta";
if (!t->conf.stream_copy && !t->conf.info_only)
- dec = "vorbis.decode";
+ dec = "ac-vorbis.decode";
} else if (ffstr_matchz(&data, OPUS_HEAD_STR)) {
meta_filter_name = "format.opusmeta";
if (!t->conf.stream_copy && !t->conf.info_only)
- dec = "opus.decode";
+ dec = "ac-opus.decode";
} else if (ffstr_matchz(&data, FLAC_HEAD_STR)) {
dec = "format.flacogg";
diff --git a/src/format/ogg-write.h b/src/format/ogg-write.h
index 353370d..93225cc 100644
--- a/src/format/ogg-write.h
+++ b/src/format/ogg-write.h
@@ -43,8 +43,8 @@ static const char* ogg_enc_mod(const char *fn)
ffpath_splitpath(fn, ffsz_len(fn), NULL, &name);
ffstr_rsplitby(&name, '.', NULL, &ext);
if (ffstr_eqcz(&ext, "opus"))
- return "opus.encode";
- return "vorbis.encode";
+ return "ac-opus.encode";
+ return "ac-vorbis.encode";
}
static int pkt_write(struct ogg_w *o, phi_track *t, ffstr *in, ffstr *out, uint64 endpos, uint flags)
diff --git a/src/format/wv.c b/src/format/wv.c
index 74f65dc..3a966bb 100644
--- a/src/format/wv.c
+++ b/src/format/wv.c
@@ -103,7 +103,7 @@ static int wv_in_process(void *ctx, phi_track *t)
w->hdr_done = 1;
const struct wvread_info *info = wvread_info(&w->wv);
t->audio.total = info->total_samples;
- if (!core->track->filter(t, core->mod("wavpack.decode"), 0))
+ if (!core->track->filter(t, core->mod("ac-wavpack.decode"), 0))
return PHI_ERR;
w->state = I_HDR_PARSED;
}
From 30608ef973825f14c7fb636d0c792659a97e6dd5 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 16 Nov 2024 09:49:08 +0300
Subject: [PATCH 18/59] 2.3-beta0
---
android/phiola/build.gradle | 4 ++--
src/phiola.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/android/phiola/build.gradle b/android/phiola/build.gradle
index 11f6792..507625d 100644
--- a/android/phiola/build.gradle
+++ b/android/phiola/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.github.stsaz.phiola"
minSdkVersion 16
targetSdk 33
- versionCode 20208
- versionName '2.2.8'
+ versionCode 20300
+ versionName '2.3-beta0'
}
buildFeatures {
diff --git a/src/phiola.h b/src/phiola.h
index d93e1fb..d7cc824 100644
--- a/src/phiola.h
+++ b/src/phiola.h
@@ -6,13 +6,13 @@
#include
#include
-#define PHI_VERSION 20208
+#define PHI_VERSION 20300
/** Inter-module compatibility version.
It must be updated when incompatible changes are made to this file,
then all modules must be rebuilt.
The core will refuse to load modules built for any other core version. */
-#define PHI_VERSION_CORE 20206
+#define PHI_VERSION_CORE 20300
typedef long long int64;
typedef unsigned long long uint64;
From cc0eefd27d56eb3cb282b7983a641d52cafc2015 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 19/59] * Android: select playlist via menu
---
.../com/github/stsaz/phiola/MainActivity.java | 39 ++++++++++++++++---
.../java/com/github/stsaz/phiola/Queue.java | 2 +
2 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
index d29a8cc..a7efc50 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
@@ -346,6 +346,10 @@ private void init_ui() {
b.bexplorer.setOnClickListener((v) -> explorer_click());
b.bplaylist.setOnClickListener((v) -> plist_click());
+ b.bplaylist.setOnLongClickListener((v) -> {
+ playlist_menu_show();
+ return true;
+ });
b.bplaylist.setChecked(true);
bplaylist_text(queue.current_list_index());
@@ -503,6 +507,20 @@ private void plist_click() {
plist_show();
}
+ private void playlist_menu_show() {
+ PopupMenu m = new PopupMenu(this, b.bplaylist);
+ m.setOnMenuItemClickListener((item) -> {
+ list_switch_i(item.getItemId());
+ return true;
+ });
+ int n = queue.number();
+ for (int i = 0; i < n; i++) {
+ String s = String.format(getString(R.string.main_playlist_n), i + 1);
+ m.getMenu().add(0, i, 0, s);
+ }
+ m.show();
+ }
+
private void file_tags_show() { startActivity(new Intent(this, TagsActivity.class)); }
/** Delete file and update view */
@@ -731,18 +749,27 @@ private void list_save() {
startActivity(new Intent(this, ListSaveActivity.class));
}
- private void list_switch() {
- list_leave();
-
- int qi = queue.next_list_select();
+ private void list_switched(int i) {
list_update();
- bplaylist_text(qi);
+ bplaylist_text(i);
- int n = gui.list_scroll_pos(qi);
+ int n = gui.list_scroll_pos(i);
if (n != 0)
b.list.scrollToPosition(n);
}
+ private void list_switch() {
+ list_leave();
+ int qi = queue.next_list_select();
+ list_switched(qi);
+ }
+
+ private void list_switch_i(int i) {
+ list_leave();
+ queue.switch_list(i);
+ list_switched(i);
+ }
+
private void list_next_add_cur() {
int qi = queue.next_list_add_cur();
if (qi >= 0)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
index ade5209..b2dd1cd 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
@@ -483,6 +483,8 @@ void rm_non_existing() {
queues.get(i_selected).remove_non_existing();
}
+ int number() { return queues.size(); }
+
/** Get tracks number in the currently selected (not filtered) list */
int count() { return queues.get(i_selected).count(); }
From 6925be292327b5d911f31bdcddd01edb7b7f5225 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 20/59] * Android: load playlists on-demand
---
.../java/com/github/stsaz/phiola/Queue.java | 25 ++++++---
src/jni/phiola-jni.c | 5 +-
src/jni/queue.h | 53 +++++++++++++------
3 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
index b2dd1cd..91ebb2c 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
@@ -13,6 +13,7 @@ class PhiolaQueue {
long q;
boolean modified;
boolean conversion;
+ String file_name;
PhiolaQueue(Phiola _phi, long _q) {
phi = _phi;
@@ -81,6 +82,13 @@ PhiolaQueue filter(String filter, int flags) {
return new PhiolaQueue(phi, phi.quFilter(q, filter, flags));
}
+ void load_once() {
+ if (file_name == null) return;
+
+ phi.quLoad(q, file_name);
+ file_name = null;
+ }
+
boolean save(String filepath) {
boolean b = phi.quSave(q, filepath);
if (b)
@@ -205,6 +213,9 @@ else if (pos < trk_idx)
case 'c':
nfy_all(QueueNotify.REMOVED, -1); break;
+ case 'a':
+ nfy_all(QueueNotify.ADDED, pos); break;
+
case 'r':
nfy_all(QueueNotify.REMOVED, pos); break;
}
@@ -243,6 +254,7 @@ else if (i_selected < i_conversion)
i_selected--;
if (i_selected < 0)
i_selected = 0;
+ queues.get(i_selected).load_once();
// As positions of all next lists have just been changed, we must rewrite the files on disk accordingly
int i = 0;
@@ -276,7 +288,7 @@ void load() {
break;
new_list();
- phi.quLoad(queues.get(i).q, fn);
+ queues.get(i).file_name = fn;
}
if (i == 0) {
@@ -288,6 +300,7 @@ void load() {
i_active = 0;
if (i_selected >= i)
i_selected = 0;
+ queues.get(i_selected).load_once();
if (flags_test(F_REPEAT))
phi.quCmd(-1, Phiola.QUCOM_REPEAT, 1);
@@ -333,12 +346,16 @@ private int index_next(int qi) {
int next_list_select() {
filter("");
i_selected = index_next(i_selected);
+ queues.get(i_selected).load_once();
return i_selected;
}
boolean conversion_list(int i) { return i == i_conversion; }
- void switch_list(int i) { i_selected = i; }
+ void switch_list(int i) {
+ i_selected = i;
+ queues.get(i_selected).load_once();
+ }
int current_list_index() { return i_selected; }
long current_list_id() { return queues.get(i_selected).q; }
@@ -494,22 +511,18 @@ void rm_non_existing() {
static final int ADD = 2;
void addmany(String[] urls, int flags) {
- int pos = count();
filter_close();
int f = 0;
if (flags == ADD_RECURSE)
f = Phiola.QUADD_RECURSE;
queues.get(i_selected).add_many(urls, f);
- nfy_all(QueueNotify.ADDED, pos);
}
/** Add an entry */
void add(String url) {
core.dbglog(TAG, "add: %s", url);
- int pos = count();
filter_close();
queues.get(i_selected).add(url, 0);
- nfy_all(QueueNotify.ADDED, pos);
}
String conf_write() {
diff --git a/src/jni/phiola-jni.c b/src/jni/phiola-jni.c
index 25d9378..3ed6445 100644
--- a/src/jni/phiola-jni.c
+++ b/src/jni/phiola-jni.c
@@ -148,7 +148,10 @@ do { \
struct core_data {
phi_task task;
uint cmd;
- int64 param_int;
+ union {
+ int64 param_int;
+ char *param_str;
+ };
phi_queue_id q;
};
diff --git a/src/jni/queue.h b/src/jni/queue.h
index 65f26bb..2b24fe2 100644
--- a/src/jni/queue.h
+++ b/src/jni/queue.h
@@ -8,6 +8,7 @@ static void qu_on_change(phi_queue_id q, uint flags, uint pos)
dbglog("%s: '%c' q:%p", __func__, flags, (size_t)q);
switch (flags) {
+ case 'a':
case 'r':
case 'c':
case 'u':
@@ -75,11 +76,21 @@ Java_com_github_stsaz_phiola_Phiola_quDestroy(JNIEnv *env, jobject thiz, jlong q
dbglog("%s: exit", __func__);
}
-JNIEXPORT void JNICALL
-Java_com_github_stsaz_phiola_Phiola_quDup(JNIEnv *env, jobject thiz, jlong jq, jlong q_src, jint pos)
+#define QUADD_RECURSE 1
+
+static void qu_cmd_add(struct core_data *d)
{
- dbglog("%s: enter", __func__);
- phi_queue_id q = (phi_queue_id)jq, iq = (phi_queue_id)q_src;
+ struct phi_queue_entry qe = {
+ .conf.ifile.name = d->param_str,
+ };
+ x->queue.add(d->q, &qe);
+ ffmem_free(d);
+}
+
+static void qu_cmd_dup(struct core_data *d)
+{
+ phi_queue_id iq = (phi_queue_id)d->param_int;
+ int pos = d->cmd;
const struct phi_queue_entry *iqe;
uint i = (pos >= 0) ? pos : 0;
for (; (iqe = x->queue.at(iq, i)); i++) {
@@ -87,14 +98,24 @@ Java_com_github_stsaz_phiola_Phiola_quDup(JNIEnv *env, jobject thiz, jlong jq, j
phi_track_conf_assign(&qe.conf, &iqe->conf);
qe.conf.ifile.name = ffsz_dup(iqe->conf.ifile.name);
x->metaif.copy(&qe.conf.meta, &iqe->conf.meta);
- x->queue.add(q, &qe);
+ x->queue.add(d->q, &qe);
if (pos >= 0)
break;
}
- dbglog("%s: exit", __func__);
+ ffmem_free(d);
}
-#define QUADD_RECURSE 1
+JNIEXPORT void JNICALL
+Java_com_github_stsaz_phiola_Phiola_quDup(JNIEnv *env, jobject thiz, jlong jq, jlong q_src, jint pos)
+{
+ dbglog("%s: enter", __func__);
+ struct core_data *d = ffmem_new(struct core_data);
+ d->q = (phi_queue_id)jq;
+ d->cmd = pos;
+ d->param_int = q_src;
+ core_task(d, qu_cmd_dup);
+ dbglog("%s: exit", __func__);
+}
JNIEXPORT void JNICALL
Java_com_github_stsaz_phiola_Phiola_quAdd(JNIEnv *env, jobject thiz, jlong q, jobjectArray jurls, jint flags)
@@ -108,10 +129,10 @@ Java_com_github_stsaz_phiola_Phiola_quAdd(JNIEnv *env, jobject thiz, jlong q, jo
js = jni_joa_i(jurls, i);
fn = jni_sz_js(js);
- struct phi_queue_entry qe = {
- .conf.ifile.name = ffsz_dup(fn),
- };
- x->queue.add((phi_queue_id)q, &qe);
+ struct core_data *d = ffmem_new(struct core_data);
+ d->q = (phi_queue_id)q;
+ d->param_str = ffsz_dup(fn);
+ core_task(d, qu_cmd_add);
}
jni_sz_free(fn, js);
@@ -564,10 +585,12 @@ Java_com_github_stsaz_phiola_Phiola_quLoad(JNIEnv *env, jobject thiz, jlong q, j
{
dbglog("%s: enter", __func__);
const char *fn = jni_sz_js(jfilepath);
- struct phi_queue_entry qe = {
- .conf.ifile.name = ffsz_dup(fn),
- };
- x->queue.add((phi_queue_id)q, &qe);
+
+ struct core_data *d = ffmem_new(struct core_data);
+ d->q = (phi_queue_id)q;
+ d->param_str = ffsz_dup(fn);
+ core_task(d, qu_cmd_add);
+
jni_sz_free(fn, jfilepath);
dbglog("%s: exit", __func__);
return 0;
From 723fdae75bf9dca374ef459caeb820d6a9123956 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 21/59] + Android: start playback from file manager via "Open
With" list
---
android/phiola/src/main/AndroidManifest.xml | 15 +++++++++++++++
.../com/github/stsaz/phiola/MainActivity.java | 9 +++++++++
.../main/java/com/github/stsaz/phiola/Util.java | 17 +++++++++++++++++
3 files changed, 41 insertions(+)
diff --git a/android/phiola/src/main/AndroidManifest.xml b/android/phiola/src/main/AndroidManifest.xml
index c665247..f70e251 100644
--- a/android/phiola/src/main/AndroidManifest.xml
+++ b/android/phiola/src/main/AndroidManifest.xml
@@ -27,6 +27,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
"/storage/emulated/0/Music/1.mp3" */
+ static String path_real(String s, String[] storage_paths) {
+ int pos = s.indexOf(':');
+ if (pos < 0 || pos + 1 == s.length())
+ return null;
+
+ String path = s.substring(pos + 1);
+ for (String stg : storage_paths) {
+ s = stg + "/" + path;
+ if (new File(s).exists())
+ return s;
+ }
+
+ return null;
+ }
+
boolean file_delete(String path) {
try {
File f = new File(path);
From b4af76f53bf391ea00585d8ddf1511b791530b80 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 22/59] * support .ts(MP3) streams
---
README.md | 2 +-
src/format/ts-read.c | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 7706b01..85e0aae 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Contents:
## Features
-* Play audio: `.mp3`, `.ogg`(Vorbis/Opus), `.mp4`/`.mov`(AAC/ALAC/MPEG), `.mkv`/`.webm`(AAC/ALAC/MPEG/Vorbis/Opus/PCM), `.caf`(AAC/ALAC/PCM), `.avi`(AAC/MPEG/PCM), `.ts`(AAC), `.aac`, `.mpc`; `.flac`, `.ape`, `.wv`, `.wav`.
+* Play audio: `.mp3`, `.ogg`(Vorbis/Opus), `.mp4`/`.mov`(AAC/ALAC/MP3), `.mkv`/`.webm`(AAC/ALAC/MP3/Vorbis/Opus/PCM), `.caf`(AAC/ALAC/PCM), `.avi`(AAC/MP3/PCM), `.ts`(AAC/MP3), `.aac`, `.mpc`; `.flac`, `.ape`, `.wv`, `.wav`.
* Record audio: `.m4a`(AAC), `.ogg`, `.opus`; `.flac`, `.wav`
* Convert audio
* List/search file meta tags; edit MP3 tags
diff --git a/src/format/ts-read.c b/src/format/ts-read.c
index d583651..56c609f 100644
--- a/src/format/ts-read.c
+++ b/src/format/ts-read.c
@@ -8,6 +8,7 @@
extern const phi_core *core;
#define errlog(t, ...) phi_errlog(core, NULL, t, __VA_ARGS__)
+#define warnlog(t, ...) phi_warnlog(core, NULL, t, __VA_ARGS__)
#define dbglog(t, ...) phi_dbglog(core, NULL, t, __VA_ARGS__)
struct ts_r {
@@ -32,6 +33,7 @@ static void* ts_open(phi_track *t)
c->pos_start_msec = ~0ULL;
uint64 tsize = (t->input.size != ~0ULL) ? t->input.size : 0;
tsread_open(&c->ts, tsize);
+ t->input.size = ~0ULL; // prevent file seek requests from the format filter
c->ts.log = ts_log;
c->ts.udata = c;
return c;
@@ -48,6 +50,8 @@ static int ts_info(struct ts_r *c, phi_track *t, const struct _tsr_pm *info)
{
const char *mod;
switch (info->stream_type) {
+ case TS_STREAM_AUDIO_MP3:
+ mod = "format.mp3"; break;
case TS_STREAM_AUDIO_AAC:
mod = "format.aac"; break;
default:
@@ -79,7 +83,7 @@ static int ts_process(void *ctx, phi_track *t)
for (;;) {
r = tsread_process(&c->ts, &c->in, &pkt);
- switch (r) {
+ switch ((enum TSREAD_R)r) {
case TSREAD_DATA:
if (c->n_pkt == 0) {
@@ -102,6 +106,11 @@ static int ts_process(void *ctx, phi_track *t)
// case TSREAD_DONE:
// return PHI_LASTOUT;
+ case TSREAD_WARN:
+ warnlog(t, "tsread_process(): %s. Offset: %U"
+ , tsread_error(&c->ts), tsread_offset(&c->ts));
+ continue;
+
case TSREAD_ERROR:
errlog(t, "tsread_process(): %s. Offset: %U"
, tsread_error(&c->ts), tsread_offset(&c->ts));
From bc8c8862e5ab371bdba5b0f5eb15d3437974c384 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 23/59] * HLS: support m3u8 sublist
---
src/net/hls.h | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/src/net/hls.h b/src/net/hls.h
index 02cf88e..d0688c4 100644
--- a/src/net/hls.h
+++ b/src/net/hls.h
@@ -46,7 +46,9 @@ struct hlsread {
phi_task task;
uint worker;
uint n_fail_tries;
+ uint n_redirect;
uint data_file :1;
+ uint m3u_file :1;
};
static struct hlsread* hls_new(struct httpcl *h)
@@ -107,6 +109,26 @@ static int hls_q_update(struct httpcl *h, ffstr d)
continue;
}
+ if (ffstr_irmatchcz(&ln, ".m3u8")) {
+ // m3u8 inside m3u8: redirect to the first sublist
+
+ if (l->seq_last) {
+ errlog(h->trk, "unexpected m3u file: %S", &ln);
+ return -1;
+ }
+
+ if (l->n_redirect++ == 10) {
+ errlog(h->trk, "couldn't reach the leaf m3u sublist. Last: %S", &ln);
+ return -1;
+ }
+
+ ffstr *ps = ffvec_zpushT(&l->q, ffstr);
+ ffstr_dupstr(ps, &ln);
+ l->m3u_file = 1;
+ n++;
+ break;
+ }
+
if (l->seq_last < seq) {
l->seq_last = seq;
ffstr *ps = ffvec_zpushT(&l->q, ffstr);
@@ -152,6 +174,14 @@ static void hls_f_request(struct httpcl *h, ffstr name)
ffstr_free(&name);
url = *(ffstr*)&l->url;
l->data_file = 1;
+
+ if (l->m3u_file) {
+ l->m3u_file = 0;
+ l->data_file = 0;
+ // set the m3u sublist as main URL
+ ffmem_free(h->trk->conf.ifile.name);
+ h->trk->conf.ifile.name = ffsz_dupstr(&url);
+ }
}
conf_prepare(h, c, h->trk, url);
@@ -184,7 +214,9 @@ static int hls_f_complete(struct httpcl *h)
if (!l->data_file) {
int r = hls_q_update(h, *(ffstr*)&l->data);
l->data.len = 0;
- if (r) {
+ if (r < 0) {
+ return -1;
+ } else if (r) {
if (!l->seq_last
|| l->n_fail_tries == 10) {
errlog(h->trk, "no more files in m3u");
From bb633a97cc5d391d7121057d15a3e7982a36baac Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 24/59] + GUI: Convert: can specify output audio tags
---
src/core/queue-entry.h | 2 +-
src/gui/convert.hpp | 14 ++++++++++++--
src/gui/lang_en.conf | 1 +
src/gui/mod.c | 6 ++++++
src/gui/ui-gtk.conf | 6 ++++++
src/gui/ui-winapi.conf | 6 ++++++
6 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/core/queue-entry.h b/src/core/queue-entry.h
index 1bcca1f..25be19f 100644
--- a/src/core/queue-entry.h
+++ b/src/core/queue-entry.h
@@ -180,7 +180,7 @@ static int qe_play(struct q_entry *e)
goto err;
}
- if (e->have_user_meta) {
+ if ((e->have_user_meta = (e->pub.conf.meta.len && !e->pub.conf.meta_transient))) {
phi_metaif->copy(&t->meta, &t->conf.meta);
}
diff --git a/src/gui/convert.hpp b/src/gui/convert.hpp
index eb9ef8c..78e274c 100644
--- a/src/gui/convert.hpp
+++ b/src/gui/convert.hpp
@@ -5,8 +5,8 @@
struct gui_wconvert {
ffui_windowxx wnd;
- ffui_labelxx ldir, lname, lext, lfrom, luntil, laacq, lvorbisq, lopusq;
- ffui_editxx edir, ename, efrom, euntil, eaacq, evorbisq, eopusq;
+ ffui_labelxx ldir, lname, lext, lfrom, luntil, ltags, laacq, lvorbisq, lopusq;
+ ffui_editxx edir, ename, efrom, euntil, etags, eaacq, evorbisq, eopusq;
ffui_comboboxxx cbext;
ffui_checkboxxx cbcopy;
ffui_buttonxx bbrowse, bstart;
@@ -27,6 +27,7 @@ FF_EXTERN const ffui_ldr_ctl wconvert_ctls[] = {
_(bbrowse),
_(lfrom), _(efrom),
_(luntil), _(euntil),
+ _(ltags), _(etags),
_(cbcopy),
_(laacq), _(eaacq),
_(lvorbisq),_(evorbisq),
@@ -188,6 +189,15 @@ static struct phi_track_conf* conv_conf_create()
tc->until_msec = time_value(xxvec(c->euntil.text()).str());
tc->stream_copy = c->conf_copy;
+ xxvec tags = c->etags.text();
+ xxstr s = tags.str(), name, val;
+ while (s.len) {
+ s.split_by(';', &name, &s);
+ name.split_by('=', &name, &val);
+ if (name.len)
+ gd->metaif->set(&tc->meta, name, val, 0);
+ }
+
tc->aac.quality = c->conf_aacq;
tc->vorbis.quality = c->conf_vorbisq;
tc->opus.bitrate = c->conf_opusq;
diff --git a/src/gui/lang_en.conf b/src/gui/lang_en.conf
index 6f10c7e..4681b23 100644
--- a/src/gui/lang_en.conf
+++ b/src/gui/lang_en.conf
@@ -77,6 +77,7 @@ MMConvert "_Convert"
CVOutChoose "Choose Output File..."
CVFrom "Start Audio Position:"
CVUntil "End Audio Position:"
+ CVTags "Tags (NAME=VALUE;...):"
CVCopy "[.mp3,.m4a,.ogg] Stream Copy"
CVAACQ "[.m4a] AAC Quality: 1..5 (VBR) or 8..800 (CBR, kbit/s)"
CVVorbisQ "[.ogg] Vorbis Quality: 0..10"
diff --git a/src/gui/mod.c b/src/gui/mod.c
index 894f771..a53109a 100644
--- a/src/gui/mod.c
+++ b/src/gui/mod.c
@@ -735,6 +735,12 @@ void convert_begin(void *param)
qe->conf.vorbis.quality = c->vorbis.quality;
qe->conf.opus.bitrate = c->opus.bitrate;
qe->conf.stream_copy = c->stream_copy;
+
+ if (c->meta.len) {
+ qe->conf.meta_transient = 0;
+ gd->metaif->destroy(&qe->conf.meta);
+ gd->metaif->copy(&qe->conf.meta, &c->meta);
+ }
}
if (i)
gd->queue->play(NULL, gd->queue->at(gd->q_convert, 0));
diff --git a/src/gui/ui-gtk.conf b/src/gui/ui-gtk.conf
index 9aa7ab6..cc12bac 100644
--- a/src/gui/ui-gtk.conf
+++ b/src/gui/ui-gtk.conf
@@ -486,6 +486,12 @@ window wconvert {
editbox euntil {
}
+ label ltags {
+ text $CVTags
+ }
+ editbox etags {
+ }
+
checkbox cbcopy {
text $CVCopy
}
diff --git a/src/gui/ui-winapi.conf b/src/gui/ui-winapi.conf
index 6342976..a3c0ef0 100644
--- a/src/gui/ui-winapi.conf
+++ b/src/gui/ui-winapi.conf
@@ -524,6 +524,12 @@ window wconvert {
editbox euntil {
}
+ label ltags {
+ text $CVTags
+ }
+ editbox etags {
+ }
+
checkbox cbcopy {
text $CVCopy
}
From 7cdc212bed33e828b9290f5a327c454b5ae3f8c6 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 25/59] + Android: Convert: can specify output audio tags
---
.../github/stsaz/phiola/ConvertActivity.java | 1 +
.../java/com/github/stsaz/phiola/Phiola.java | 2 ++
android/phiola/src/main/res/layout/convert.xml | 13 +++++++++++++
android/phiola/src/main/res/values/strings.xml | 1 +
src/jni/queue.h | 17 +++++++++++++++++
5 files changed, 34 insertions(+)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
index 4429c0f..893bc89 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java
@@ -267,6 +267,7 @@ private void convert() {
Phiola.ConvertParams p = new Phiola.ConvertParams();
p.from_msec = b.eFrom.getText().toString();
p.to_msec = b.eUntil.getText().toString();
+ p.tags = b.eTags.getText().toString();
p.sample_format = CoreSettings.conv_sample_formats[b.spSampleFormat.getSelectedItemPosition()];
p.sample_rate = core.str_to_uint(b.eSampleRate.getText().toString(), 0);
p.aac_quality = core.setts.conv_aac_quality;
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
index 766bd43..5727b7b 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
@@ -57,6 +57,7 @@ static class ConvertParams {
out_name = "";
from_msec = "";
to_msec = "";
+ tags = "";
trash_dir_rel = "";
q_pos = -1;
}
@@ -71,6 +72,7 @@ static class ConvertParams {
String out_name;
String from_msec, to_msec;
+ String tags;
int sample_format;
int sample_rate;
int aac_quality;
diff --git a/android/phiola/src/main/res/layout/convert.xml b/android/phiola/src/main/res/layout/convert.xml
index c3f2fe4..a84140b 100644
--- a/android/phiola/src/main/res/layout/convert.xml
+++ b/android/phiola/src/main/res/layout/convert.xml
@@ -126,6 +126,19 @@
android:layout_marginHorizontal="@dimen/sett_margin"
android:text="@string/conv_from_set_cur" />
+
+
+
Start Audio Position:
Set To Current
End Audio Position:
+ Tags (NAME=VALUE;...):
Filters
Sample Format
diff --git a/src/jni/queue.h b/src/jni/queue.h
index 2b24fe2..ae9b619 100644
--- a/src/jni/queue.h
+++ b/src/jni/queue.h
@@ -454,11 +454,13 @@ Java_com_github_stsaz_phiola_Phiola_quConvertBegin(JNIEnv *env, jobject thiz, jl
jstring jout_name = jni_obj_jo(jconf, jni_field_str(jc_conf, "out_name"));
jstring jfrom = jni_obj_jo(jconf, jni_field_str(jc_conf, "from_msec"));
jstring jto = jni_obj_jo(jconf, jni_field_str(jc_conf, "to_msec"));
+ jstring jtags = jni_obj_jo(jconf, jni_field_str(jc_conf, "tags"));
jstring jtrash_dir_rel = jni_obj_jo(jconf, jni_field_str(jc_conf, "trash_dir_rel"));
uint flags = jni_obj_int(jconf, jni_field_int(jc_conf, "flags"));
const char *ofn = jni_sz_js(jout_name)
, *from = jni_sz_js(jfrom)
, *to = jni_sz_js(jto)
+ , *tags = jni_sz_js(jtags)
, *trash_dir_rel = jni_sz_js(jtrash_dir_rel);
struct phi_track_conf conf = {
@@ -481,6 +483,14 @@ Java_com_github_stsaz_phiola_Phiola_quConvertBegin(JNIEnv *env, jobject thiz, jl
goto end;
}
+ ffstr s = FFSTR_INITZ(tags), name, val;
+ while (s.len) {
+ ffstr_splitby(&s, ';', &name, &s);
+ ffstr_splitby(&name, '=', &name, &val);
+ if (name.len)
+ x->metaif.set(&conf.meta, name, val, 0);
+ }
+
ffmem_free(x->convert.trash_dir_rel);
x->convert.trash_dir_rel = (trash_dir_rel[0]) ? ffsz_dup(trash_dir_rel) : NULL;
@@ -508,6 +518,12 @@ Java_com_github_stsaz_phiola_Phiola_quConvertBegin(JNIEnv *env, jobject thiz, jl
c->ofile.name = ffsz_dup(ofn);
c->ofile.name_tmp = 1;
c->ofile.overwrite = conf.ofile.overwrite;
+
+ if (conf.meta.len) {
+ qe->conf.meta_transient = 0;
+ x->metaif.destroy(&c->meta);
+ x->metaif.copy(&c->meta, &conf.meta);
+ }
}
ffvec_free_align(&x->convert.tracks);
@@ -525,6 +541,7 @@ Java_com_github_stsaz_phiola_Phiola_quConvertBegin(JNIEnv *env, jobject thiz, jl
jni_sz_free(ofn, jout_name);
jni_sz_free(from, jfrom);
jni_sz_free(to, jto);
+ jni_sz_free(tags, jtags);
jstring js = jni_js_sz(error);
dbglog("%s: exit", __func__);
return js;
From 330715877da6ef9e9f1e4c9e7075f3ea7e15ef86 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 26/59] * convert/record: default Vorbis encoding quality = 5
---
src/exe/convert.h | 2 +-
src/exe/record.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/exe/convert.h b/src/exe/convert.h
index 8c46726..1dd8b60 100644
--- a/src/exe/convert.h
+++ b/src/exe/convert.h
@@ -231,7 +231,7 @@ static void conv_qu_add(struct cmd_conv *v, ffstr *fn)
.quality = v->aac_q,
.bandwidth = (ushort)v->aac_bandwidth,
},
- .vorbis.quality = (v->vorbis_q + 1) * 10,
+ .vorbis.quality = (v->vorbis_q) ? (v->vorbis_q + 1) * 10 : 0,
.opus = {
.bitrate = v->opus_q,
.mode = v->opus_mode_n,
diff --git a/src/exe/record.h b/src/exe/record.h
index 1047f36..f8c554e 100644
--- a/src/exe/record.h
+++ b/src/exe/record.h
@@ -163,7 +163,7 @@ static int rec_action(struct cmd_rec *r)
.profile = r->aac_profile[0],
.quality = r->aac_q,
},
- .vorbis.quality = (r->vorbis_q + 1) * 10,
+ .vorbis.quality = (r->vorbis_q) ? (r->vorbis_q + 1) * 10 : 0,
.opus = {
.bitrate = r->opus_q,
.mode = r->opus_mode_n,
From d45ded34501feb1ab197760ef5f8488b08116064 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 27/59] minor
---
.../com/github/stsaz/phiola/MainActivity.java | 24 +++++++++++--------
android/phiola/src/main/res/menu/list.xml | 9 -------
.../phiola/src/main/res/values/strings.xml | 3 ++-
src/format/detector.h | 11 ++++++++-
src/list/m3u-read.h | 5 ++++
src/list/m3u.c | 1 +
src/net/hls.h | 5 ++++
src/net/http.c | 11 +++++----
8 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
index 5499b2f..516f206 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
@@ -216,16 +216,7 @@ private boolean list_menu_click(MenuItem item) {
list_next_add_cur(); break;
case R.id.action_list_sort:
- queue.sort(Phiola.QU_SORT_FILENAME); break;
-
- case R.id.action_list_sort_filesize:
- queue.sort(Phiola.QU_SORT_FILESIZE); break;
-
- case R.id.action_list_sort_filedate:
- queue.sort(Phiola.QU_SORT_FILEDATE); break;
-
- case R.id.action_list_shuffle:
- queue.sort(Phiola.QU_SORT_RANDOM); break;
+ sort_menu_show(); break;
case R.id.action_list_convert:
list_convert(); break;
@@ -239,6 +230,19 @@ private boolean list_menu_click(MenuItem item) {
return true;
}
+ private void sort_menu_show() {
+ PopupMenu m = new PopupMenu(this, b.list);
+ m.setOnMenuItemClickListener((item) -> {
+ queue.sort(item.getItemId());
+ return true;
+ });
+ m.getMenu().add(0, Phiola.QU_SORT_FILENAME, 0, getString(R.string.mlist_sort_filename));
+ m.getMenu().add(0, Phiola.QU_SORT_FILESIZE, 0, getString(R.string.mlist_sort_filesize));
+ m.getMenu().add(0, Phiola.QU_SORT_FILEDATE, 0, getString(R.string.mlist_sort_filedate));
+ m.getMenu().add(0, Phiola.QU_SORT_RANDOM, 0, getString(R.string.mlist_shuffle));
+ m.show();
+ }
+
private static final int
REQUEST_PERM_READ_STORAGE = 1,
REQUEST_PERM_RECORD = 2;
diff --git a/android/phiola/src/main/res/menu/list.xml b/android/phiola/src/main/res/menu/list.xml
index 4a1a5eb..27f4af0 100644
--- a/android/phiola/src/main/res/menu/list.xml
+++ b/android/phiola/src/main/res/menu/list.xml
@@ -32,15 +32,6 @@
diff --git a/src/net/hls.h b/src/net/hls.h
index d0688c4..3789fd6 100644
--- a/src/net/hls.h
+++ b/src/net/hls.h
@@ -109,6 +109,11 @@ static int hls_q_update(struct httpcl *h, ffstr d)
continue;
}
+ if (!ffutf8_valid(ln.ptr, ln.len)) {
+ errlog(h->trk, "bad UTF-8 URL");
+ return -1;
+ }
+
if (ffstr_irmatchcz(&ln, ".m3u8")) {
// m3u8 inside m3u8: redirect to the first sublist
diff --git a/src/net/http.c b/src/net/http.c
index 5cedee2..e3286d8 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -137,11 +137,12 @@ int phi_hc_resp(void *ctx, struct phi_http_data *d)
static const struct map_sz24_vptr ct_ext[] = {
{ "application/ogg", "ogg" },
{ "application/x-mpegURL", "m3u" },
- { "audio/aac", "aac" },
- { "audio/aacp", "aac" },
- { "audio/mpeg", "mp3" },
- { "audio/ogg", "ogg" },
- { "video/MP2T", "ts" },
+ { "audio/aac", "aac" },
+ { "audio/aacp", "aac" },
+ { "audio/mpeg", "mp3" },
+ { "audio/ogg", "ogg" },
+ { "audio/x-aac", "aac" },
+ { "video/MP2T", "ts" },
};
h->trk->data_type = map_sz24_vptr_findstr(ct_ext, FF_COUNT(ct_ext), d->ct); // help format.detector in case it didn't detect format
if (!h->trk->data_type
From 18ecfc4658b264e9178da3d36dcb076abc482d0a Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 23 Nov 2024 09:06:35 +0300
Subject: [PATCH 28/59] 2.3-beta1
---
android/phiola/build.gradle | 4 ++--
src/phiola.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/android/phiola/build.gradle b/android/phiola/build.gradle
index 507625d..59ff8d9 100644
--- a/android/phiola/build.gradle
+++ b/android/phiola/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.github.stsaz.phiola"
minSdkVersion 16
targetSdk 33
- versionCode 20300
- versionName '2.3-beta0'
+ versionCode 20301
+ versionName '2.3-beta1'
}
buildFeatures {
diff --git a/src/phiola.h b/src/phiola.h
index d7cc824..9cf2535 100644
--- a/src/phiola.h
+++ b/src/phiola.h
@@ -6,7 +6,7 @@
#include
#include
-#define PHI_VERSION 20300
+#define PHI_VERSION 20301
/** Inter-module compatibility version.
It must be updated when incompatible changes are made to this file,
From f25d648a36a75b90cee58a94bd9fdae1e626eace Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 30 Nov 2024 08:57:42 +0300
Subject: [PATCH 29/59] + TUI: Play first/last track by `Home`/`End` keys
+ TUI: Play track at index by pressing numeric keys
---
src/tui/help.txt | 3 +++
src/tui/play.h | 2 +-
src/tui/tui.c | 65 +++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/src/tui/help.txt b/src/tui/help.txt
index 4e4f217..edc34fe 100644
--- a/src/tui/help.txt
+++ b/src/tui/help.txt
@@ -6,6 +6,9 @@ Space Play/Pause
s Stop
n Next track
p Previous track
+Home First track
+End Last track
+[0-9]... Play track at index
Right Seek forward
+Alt medium step
diff --git a/src/tui/play.h b/src/tui/play.h
index 3cd3360..8bf17cf 100644
--- a/src/tui/play.h
+++ b/src/tui/play.h
@@ -325,7 +325,7 @@ static void tuiplay_rm_playnext(tui_track *u)
if (!u->t) return;
tuiplay_rm(u);
- cmd_next();
+ cmd_activate(CMD_NEXT);
}
static const phi_filter phi_tuiplay = {
diff --git a/src/tui/tui.c b/src/tui/tui.c
index 0718ba9..6b99b5e 100644
--- a/src/tui/tui.c
+++ b/src/tui/tui.c
@@ -59,6 +59,9 @@ struct tui_mod {
uint vol;
uint progress_dots;
+ uint activating_track_n;
+ phi_timer activating_track_n_tmr;
+
struct {
const char *progress,
*filename,
@@ -95,6 +98,11 @@ enum CMDS {
CMD_VOLUP,
CMD_VOLDOWN,
CMD_MUTE,
+ CMD_NEXT,
+ CMD_PREV,
+ CMD_FIRST,
+ CMD_LAST,
+ CMD_ACTIVATE_N,
CMD_SHOWTAGS,
@@ -117,7 +125,7 @@ typedef void (*cmdfunc1)(uint cmd);
static void tui_cmd_read(void *param);
static void tui_help(uint cmd);
static void tui_op(uint cmd);
-static void cmd_next();
+static void cmd_activate(uint cmd);
static void tui_print(const void *d, ffsize n)
{
@@ -146,14 +154,31 @@ static void cmd_play()
tuiplay_pause_resume(mod->curtrk);
}
-static void cmd_next()
+static void cmd_activate(uint cmd)
{
- mod->queue->play_next(NULL);
-}
+ uint i = 0;
+ switch (cmd) {
+ case CMD_NEXT:
+ mod->queue->play_next(NULL); return;
-static void cmd_prev()
-{
- mod->queue->play_previous(NULL);
+ case CMD_PREV:
+ mod->queue->play_previous(NULL); return;
+
+ case CMD_FIRST:
+ break;
+
+ case CMD_LAST:
+ i = mod->queue->count(NULL) - 1;
+ break;
+
+ case CMD_ACTIVATE_N:
+ i = mod->activating_track_n - 1;
+ break;
+ }
+
+ void *qe = mod->queue->at(NULL, i);
+ if (qe)
+ mod->queue->play(NULL, qe);
}
static void cmd_random()
@@ -210,8 +235,8 @@ static const struct key hotkeys[] = {
{ 'h', _CMD_F1, tui_help },
{ 'i', CMD_SHOWTAGS | _CMD_CURTRK | _CMD_CORE, tui_op_trk },
{ 'm', CMD_MUTE | _CMD_CURTRK | _CMD_CORE, tuiplay_vol },
- { 'n', _CMD_PLAYBACK | _CMD_F1 | _CMD_CORE, cmd_next },
- { 'p', _CMD_PLAYBACK | _CMD_F1 | _CMD_CORE, cmd_prev },
+ { 'n', CMD_NEXT | _CMD_PLAYBACK | _CMD_F1 | _CMD_CORE, cmd_activate },
+ { 'p', CMD_PREV | _CMD_PLAYBACK | _CMD_F1 | _CMD_CORE, cmd_activate },
{ 'q', CMD_QUIT | _CMD_F1 | _CMD_CORE, tui_op },
{ 'r', _CMD_PLAYBACK | _CMD_F1 | _CMD_CORE, cmd_random },
{ 's', CMD_STOP | _CMD_F1 | _CMD_CORE, tui_op },
@@ -221,6 +246,8 @@ static const struct key hotkeys[] = {
{ FFKEY_DOWN, CMD_VOLDOWN | _CMD_CURTRK | _CMD_CORE, tuiplay_vol },
{ FFKEY_RIGHT, CMD_SEEKRIGHT | _CMD_CURTRK | _CMD_F3 | _CMD_CORE, tuiplay_seek },
{ FFKEY_LEFT, CMD_SEEKLEFT | _CMD_CURTRK | _CMD_F3 | _CMD_CORE, tuiplay_seek },
+ { FFKEY_HOME, CMD_FIRST | _CMD_PLAYBACK | _CMD_F1 | _CMD_CORE, cmd_activate },
+ { FFKEY_END, CMD_LAST | _CMD_PLAYBACK | _CMD_F1 | _CMD_CORE, cmd_activate },
};
static const struct key* key2cmd(int key)
@@ -329,6 +356,22 @@ static void tui_stdin_prepare(void *param)
tui_cmd_read(mod);
}
+static void act_trk_tmr(void *param)
+{
+ cmd_activate(CMD_ACTIVATE_N);
+ mod->activating_track_n = 0;
+}
+
+static int act_trk_key_process(uint k)
+{
+ if (k >= '0' && k <= '9') {
+ mod->activating_track_n = (mod->activating_track_n * 10) + (k - '0');
+ core->timer(0, &mod->activating_track_n_tmr, -800, act_trk_tmr, NULL);
+ return 0;
+ }
+ return -1;
+}
+
static void tui_cmd_read(void *param)
{
ffstd_ev ev = {};
@@ -352,10 +395,13 @@ static void tui_cmd_read(void *param)
const struct key *k = key2cmd(key);
if (k == NULL) {
+ if (!act_trk_key_process(key & ~FFKEY_MODMASK))
+ continue;
dbglog(NULL, "unknown key seq %*xb"
, (ffsize)keydata.len, keydata.ptr);
continue;
}
+
dbglog(NULL, "received command %u", k->cmd & CMD_MASK);
if (k->cmd & _CMD_CORE) {
@@ -419,6 +465,7 @@ static void tui_destroy()
uint attr = FFSTD_LINEINPUT;
ffstd_attr(ffstdin, attr, attr);
+ core->timer(0, &mod->activating_track_n_tmr, 0, NULL, NULL);
ffmem_free(mod);
}
From 1eaacea3ea3a40cfec9508ce0fb3e61adc136151 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 30 Nov 2024 08:57:42 +0300
Subject: [PATCH 30/59] + remote: new commands `seek forward` and `seek back`
---
src/exe/remote.h | 3 +++
src/phiola.h | 1 +
src/remote-ctl.c | 22 ++++++++++++++++++++--
src/tui/tui.c | 10 ++++++++++
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/src/exe/remote.h b/src/exe/remote.h
index 3166b2e..d6a4eba 100644
--- a/src/exe/remote.h
+++ b/src/exe/remote.h
@@ -14,6 +14,9 @@ Commands:\n\
`next` Play next track\n\
`previous` Play previous track\n\
`stop` Stop all tracks\n\
+ `seek` PARAM Seek:\n\
+ `forward`\n\
+ `back`\n\
`volume` NUMBER Set playback volume level: 0..100\n\
`quit` Exit\n\
");
diff --git a/src/phiola.h b/src/phiola.h
index 9cf2535..59401eb 100644
--- a/src/phiola.h
+++ b/src/phiola.h
@@ -576,4 +576,5 @@ typedef struct phi_ui_if phi_ui_if;
struct phi_ui_if {
void (*conf)(struct phi_ui_conf *c);
void (*log)(void *udata, ffstr s);
+ void (*seek)(uint val, uint flags);
};
diff --git a/src/remote-ctl.c b/src/remote-ctl.c
index be37a4d..1cee698 100644
--- a/src/remote-ctl.c
+++ b/src/remote-ctl.c
@@ -13,6 +13,7 @@
struct remote_ctl {
const phi_core* core;
const phi_queue_if* queue;
+ const phi_ui_if* ui;
phi_kevent server_kev;
fffd server_pipe;
@@ -62,12 +63,28 @@ static int cmd_quit() {
return 0;
}
+static int cmd_seek(void *o, ffstr s) {
+ uint f;
+ if (ffstr_eqz(&s, "forward"))
+ f = 0;
+ else if (ffstr_eqz(&s, "back"))
+ f = 1;
+ else
+ return 0;
+
+ if (!g->ui)
+ g->ui = g->core->mod("tui.if");
+ g->ui->seek(0, f);
+ return 0;
+}
+
static int cmd_volume(void *o, uint64 n) {
struct phi_ui_conf uc = {
.volume_percent = n,
};
- const phi_ui_if *uif = g->core->mod("tui.if");
- uif->conf(&uc);
+ if (!g->ui)
+ g->ui = g->core->mod("tui.if");
+ g->ui->conf(&uc);
return 0;
}
@@ -77,6 +94,7 @@ static const struct ffarg args[] = {
{ "play", '1', cmd_play },
{ "previous", '1', cmd_previous },
{ "quit", '1', cmd_quit },
+ { "seek", 'S', cmd_seek },
{ "start", 'S', cmd_start },
{ "stop", '1', cmd_stop },
{ "volume", 'u', cmd_volume },
diff --git a/src/tui/tui.c b/src/tui/tui.c
index 6b99b5e..664a598 100644
--- a/src/tui/tui.c
+++ b/src/tui/tui.c
@@ -478,8 +478,18 @@ static void tui_conf(struct phi_ui_conf *c)
}
}
+static void tui_play_seek(uint val, uint flags)
+{
+ if (!mod->curtrk) return;
+
+ uint cmd = CMD_SEEKRIGHT;
+ if (flags & 1) cmd = CMD_SEEKLEFT;
+ tuiplay_seek(mod->curtrk, cmd, (void*)0);
+}
+
static struct phi_ui_if phi_tui_if = {
.conf = tui_conf,
+ .seek = tui_play_seek,
};
static const void* tui_iface(const char *name)
From 75a0f557ba8992e1e948f495bcf3ee02da57aea6 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 30 Nov 2024 08:57:42 +0300
Subject: [PATCH 31/59] * support redirection between plain HTTP and HTTPS
---
src/net/http-bridge.h | 3 +++
src/net/http-filters.c | 9 +++++++++
src/net/http.c | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+)
diff --git a/src/net/http-bridge.h b/src/net/http-bridge.h
index 11a874e..09498ed 100644
--- a/src/net/http-bridge.h
+++ b/src/net/http-bridge.h
@@ -11,3 +11,6 @@ struct phi_http_data {
extern int phi_hc_resp(void *ctx, struct phi_http_data *d);
extern int phi_hc_data(void *ctx, ffstr data, uint flags);
+
+/** Get necessary info for handling HTTP<->HTTPS redirection */
+extern const char* http_e_redirect(nml_http_client *c);
diff --git a/src/net/http-filters.c b/src/net/http-filters.c
index fb2c905..3d01428 100644
--- a/src/net/http-filters.c
+++ b/src/net/http-filters.c
@@ -45,6 +45,15 @@ static const nml_http_cl_component nml_http_cl_phi_bridge = {
"phiola-output"
};
+const char* http_e_redirect(nml_http_client *c)
+{
+ if (c->error == NML_HC_E_REDIRECT) {
+ c->error = 0;
+ return c->redirect_location;
+ }
+ return NULL;
+}
+
const nml_http_cl_component *hc_chain[] = {
&nml_http_cl_resolve,
diff --git a/src/net/http.c b/src/net/http.c
index e3286d8..8c679eb 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -35,6 +35,7 @@ struct httpcl {
uint cl_state;
uint done :1;
uint icy :1;
+ uint n_redirect;
struct hlsread *hls;
};
@@ -231,10 +232,43 @@ int phi_hc_data(void *ctx, ffstr data, uint flags)
return NMLR_ERR;
}
+static void http_request(struct httpcl *h, ffstr url)
+{
+ nml_http_client_free(h->cl);
+ ffstr_free(&h->conf.headers);
+ ffmem_zero_obj(&h->conf);
+
+ dbglog(h->trk, "requesting %S", &url);
+ h->cl = nml_http_client_create();
+ conf_prepare(h, &h->conf, h->trk, url);
+ nml_http_client_conf(h->cl, &h->conf);
+ nml_http_client_run(h->cl);
+}
+
+static int http_redirect(struct httpcl *h, const char *location)
+{
+ if (h->n_redirect++ == 10) {
+ errlog(h->trk, "reached max. number of full redirects");
+ return -1;
+ }
+
+ ffmem_free(h->trk->conf.ifile.name);
+ h->trk->conf.ifile.name = ffsz_dup(location);
+
+ http_request(h, FFSTR_Z(h->trk->conf.ifile.name));
+ return 0;
+}
+
static void on_complete(void *param)
{
struct httpcl *h = param;
+ const char *redirect_location;
+ if (!h->hls && (redirect_location = http_e_redirect(h->cl))) {
+ if (!http_redirect(h, redirect_location))
+ return;
+ }
+
if (h->hls
&& !hls_f_complete(h))
return;
From 8ab4f9d35fa0b31ddff84e1d1a67f9fb7a0a9383 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 30 Nov 2024 08:57:42 +0300
Subject: [PATCH 32/59] minor
---
.../github/stsaz/phiola/AddURLActivity.java | 2 +-
.../java/com/github/stsaz/phiola/GUI.java | 44 +++++++-----
.../github/stsaz/phiola/ListSaveActivity.java | 2 +-
.../com/github/stsaz/phiola/MainActivity.java | 68 +++++++++---------
.../github/stsaz/phiola/PlaylistAdapter.java | 12 ++--
.../java/com/github/stsaz/phiola/Queue.java | 72 ++++++++++---------
.../java/com/github/stsaz/phiola/Svc.java | 4 +-
.../com/github/stsaz/phiola/TagsActivity.java | 2 +-
.../com/github/stsaz/phiola/UtilNative.java | 6 +-
src/format/ts-read.c | 8 +--
src/jni/android-utils.h | 4 +-
src/jni/phiola-jni.c | 3 +
src/jni/queue.h | 34 ++++++++-
src/net/hls.h | 12 +---
src/net/http.c | 1 +
src/tui/help.txt | 3 +
src/tui/tui.c | 2 +
17 files changed, 155 insertions(+), 124 deletions(-)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/AddURLActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/AddURLActivity.java
index 1dd1eab..b24285f 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/AddURLActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/AddURLActivity.java
@@ -38,7 +38,7 @@ private void add() {
core.gui().msg_show(AddURLActivity.this, "Unsupported URL");
return;
}
- core.queue().add(fn);
+ core.queue().current_add(fn, 0);
finish();
}
}
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java b/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java
index e43ed5f..304b6dd 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java
@@ -8,6 +8,8 @@
import android.content.DialogInterface;
import android.widget.Toast;
+import java.util.ArrayList;
+
class GUI {
private static final String TAG = "phiola.GUI";
private Core core;
@@ -17,10 +19,11 @@ class GUI {
boolean record_hide;
boolean ainfo_in_title;
String cur_path = ""; // current explorer path
- private int[] list_pos; // list scroll position
+ private ArrayList list_pos; // list scroll position
- static final int THM_DEF = 0;
- static final int THM_DARK = 1;
+ static final int
+ THM_DEF = 0,
+ THM_DARK = 1;
int theme;
static final int
@@ -36,28 +39,29 @@ class GUI {
GUI(Core core) {
this.core = core;
- list_pos = new int[3];
+ list_pos = new ArrayList<>();
}
String conf_write() {
+ String list_pos_str = "";
+ for (Integer it : list_pos) {
+ list_pos_str += String.format("%d ", it);
+ }
+
return String.format(
"ui_curpath %s\n"
+ "ui_state_hide %d\n"
+ "ui_filter_hide %d\n"
+ "ui_record_hide %d\n"
+ "ui_info_in_title %d\n"
- + "ui_list_scroll_pos0 %d\n"
- + "ui_list_scroll_pos1 %d\n"
- + "ui_list_scroll_pos2 %d\n"
+ + "ui_list_scroll_pos %s\n"
+ "ui_theme %d\n"
, cur_path
, core.bool_to_int(state_hide)
, core.bool_to_int(filter_hide)
, core.bool_to_int(record_hide)
, core.bool_to_int(ainfo_in_title)
- , list_pos[0]
- , list_pos[1]
- , list_pos[2]
+ , list_pos_str
, theme
);
}
@@ -68,10 +72,14 @@ void conf_load(Conf.Entry[] kv) {
filter_hide = kv[Conf.UI_FILTER_HIDE].enabled;
record_hide = kv[Conf.UI_RECORD_HIDE].enabled;
ainfo_in_title = kv[Conf.UI_INFO_IN_TITLE].enabled;
- list_pos[0] = kv[Conf.UI_LIST_SCROLL_POS0].number;
- list_pos[1] = kv[Conf.UI_LIST_SCROLL_POS1].number;
- list_pos[2] = kv[Conf.UI_LIST_SCROLL_POS2].number;
+ String list_pos_str = kv[Conf.UI_LIST_SCROLL_POS].value;
theme = kv[Conf.UI_THEME].number;
+
+ String[] v = list_pos_str.split(" ");
+ for (String s : v) {
+ if (!s.isEmpty())
+ list_pos.add(Util.str_to_uint(s, 0));
+ }
}
boolean state_test(int mask) { return (state & mask) != 0; }
@@ -86,14 +94,16 @@ int state_update(int mask, int val) {
}
int list_scroll_pos(int i) {
- if (i >= list_pos.length)
+ if (i >= list_pos.size())
return 0;
- return list_pos[i];
+ return list_pos.get(i);
}
void list_scroll_pos_set(int i, int n) {
- if (i < list_pos.length)
- list_pos[i] = n;
+ for (int j = list_pos.size(); j <= i; j++) {
+ list_pos.add(0);
+ }
+ list_pos.set(i, n);
}
void on_error(String fmt, Object... args) {
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java
index aac2ca0..50e7de5 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/ListSaveActivity.java
@@ -49,7 +49,7 @@ private void save() {
core.errlog(TAG, "File already exists. Please specify a different name.");
return;
}
- if (!core.queue().save(fn)) {
+ if (!core.queue().current_save(fn)) {
core.errlog(TAG, "Error saving playlist file");
return;
}
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
index 516f206..9721bd8 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
@@ -195,7 +195,7 @@ private boolean list_menu_click(MenuItem item) {
list_rm(); break;
case R.id.action_list_rm_non_existing:
- queue.rm_non_existing(); break;
+ queue.current_remove_non_existing(); break;
case R.id.action_list_clear:
list_clear(); break;
@@ -206,7 +206,7 @@ private boolean list_menu_click(MenuItem item) {
case R.id.action_list_showcur: {
if (view_explorer)
plist_click();
- int pos = queue.active_track_pos();
+ int pos = queue.active_pos();
if (pos >= 0)
b.list.scrollToPosition(pos);
break;
@@ -216,7 +216,7 @@ private boolean list_menu_click(MenuItem item) {
list_next_add_cur(); break;
case R.id.action_list_sort:
- sort_menu_show(); break;
+ list_sort_menu_show(); break;
case R.id.action_list_convert:
list_convert(); break;
@@ -230,10 +230,10 @@ private boolean list_menu_click(MenuItem item) {
return true;
}
- private void sort_menu_show() {
+ private void list_sort_menu_show() {
PopupMenu m = new PopupMenu(this, b.list);
m.setOnMenuItemClickListener((item) -> {
- queue.sort(item.getItemId());
+ queue.current_sort(item.getItemId());
return true;
});
m.getMenu().add(0, Phiola.QU_SORT_FILENAME, 0, getString(R.string.mlist_sort_filename));
@@ -364,7 +364,7 @@ private void init_ui() {
return true;
});
b.bplaylist.setChecked(true);
- bplaylist_text(queue.current_list_index());
+ bplaylist_text(queue.current_index());
b.seekbar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
int val; // last value
@@ -442,7 +442,7 @@ private void rec_fin(int code, String filename) {
stopService(new Intent(this, RecSvc.class));
if (code == 0) {
if (core.setts.rec_list_add)
- queue.add(filename);
+ queue.current_add(filename, 0);
gui.msg_show(this, getString(R.string.main_rec_fin));
}
@@ -550,15 +550,15 @@ private void file_del(int pos, String fn) {
return;
gui.msg_show(this, "Deleted file");
}
- queue.remove(pos);
+ queue.active_remove(pos);
}
/** Ask confirmation before deleting the currently playing file from storage */
private void file_del_cur() {
- int pos = queue.active_track_pos();
- if (pos < 0)
+ int pos = queue.active_pos();
+ String fn = queue.active_track_url();
+ if (fn == null)
return;
- String fn = queue.get(pos);
AlertDialog.Builder b = new AlertDialog.Builder(this);
b.setIcon(android.R.drawable.ic_dialog_alert);
@@ -591,10 +591,9 @@ private void file_move_cur() {
}
private void file_move_cur_confirmed() {
- int pos = queue.active_track_pos();
- if (pos < 0)
+ String fn = queue.active_track_url();
+ if (fn == null)
return;
- String fn = queue.get(pos);
String e = core.util.fileMove(fn, core.setts.quick_move_dir);
if (!e.isEmpty()) {
@@ -611,14 +610,11 @@ void explorer_event(String fn, int flags) {
return;
}
- int n = queue.count();
- String[] ents = new String[1];
- ents[0] = fn;
- queue.addmany(ents, flags);
- core.dbglog(TAG, "added %d items", ents.length);
- gui.msg_show(this, "Added %d items to playlist", ents.length);
+ int n = queue.current_items();
+ queue.current_add(fn, flags);
+ gui.msg_show(this, "Added %d items to playlist", 1);
if (flags == Queue.ADD)
- queue.play(n);
+ queue.current_play(n);
}
private void explorer_file_current_show() {
@@ -653,21 +649,21 @@ private void list_update() {
}
private void plist_show() {
- int n = gui.list_scroll_pos(queue.current_list_index());
+ int n = gui.list_scroll_pos(queue.current_index());
if (n != 0)
b.list.scrollToPosition(n);
}
/** Called when we're leaving the playlist tab */
void list_leave() {
- queue.filter("");
+ queue.current_filter("");
LinearLayoutManager llm = (LinearLayoutManager)b.list.getLayoutManager();
- gui.list_scroll_pos_set(queue.current_list_index(), llm.findLastCompletelyVisibleItemPosition());
+ gui.list_scroll_pos_set(queue.current_index(), llm.findLastCompletelyVisibleItemPosition());
}
private void plist_filter(String filter) {
core.dbglog(TAG, "list_filter: %s", filter);
- queue.filter(filter);
+ queue.current_filter(filter);
list_update();
}
@@ -713,7 +709,7 @@ private void list_new() {
private void list_close() {
if (view_explorer) return;
- if (0 == queue.count()) {
+ if (0 == queue.current_items()) {
list_close_confirmed();
return;
}
@@ -726,34 +722,34 @@ private void list_close() {
}
private void list_close_confirmed() {
- if (queue.close_current_list() != 0) {
+ if (queue.current_close() != 0) {
core.errlog(TAG, "Please wait until the conversion is complete");
return;
}
gui.msg_show(this, getString(R.string.mlist_closed));
list_update();
- bplaylist_text(queue.current_list_index());
+ bplaylist_text(queue.current_index());
}
private void list_clear() {
- if (0 == queue.count())
+ if (0 == queue.current_items())
return;
gui.dlg_question(this, "Clear playlist"
, "Remove all items from the current playlist?"
, "Clear", "Do nothing"
- , (dialog, which) -> { queue.clear(); }
+ , (dialog, which) -> { queue.current_clear(); }
);
}
/** Remove currently playing track from playlist */
private void list_rm() {
- int pos = queue.active_track_pos();
+ int pos = queue.active_pos();
if (pos < 0)
return;
- queue.remove(pos);
+ queue.active_remove(pos);
gui.msg_show(this, getString(R.string.mlist_trk_rm));
}
@@ -821,8 +817,8 @@ static String q_error(int e) {
}
private void list_convert() {
- long qi_old = queue.current_list_id();
- int trk_pos = queue.active_track_pos();
+ long qi_old = queue.current_id();
+ int trk_pos = queue.active_pos();
int qi = queue.convert_add(Queue.CONV_CUR_LIST);
if (qi < 0) {
@@ -848,8 +844,8 @@ private void list_convert() {
}
private void file_convert() {
- long qi_old = queue.current_list_id();
- int trk_pos = queue.active_track_pos();
+ long qi_old = queue.current_id();
+ int trk_pos = queue.active_pos();
int qi = queue.convert_add(Queue.CONV_CUR_FILE);
if (qi < 0) {
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/PlaylistAdapter.java b/android/phiola/src/main/java/com/github/stsaz/phiola/PlaylistAdapter.java
index 3c2970d..0d51520 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/PlaylistAdapter.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/PlaylistAdapter.java
@@ -1,7 +1,5 @@
-/**
- * phiola/Android
- * 2023, Simon Zolin
- */
+/** phiola/Android
+2023, Simon Zolin */
package com.github.stsaz.phiola;
@@ -41,6 +39,7 @@ public boolean onLongClick(View v) {
class PlaylistAdapter extends RecyclerView.Adapter {
+ private static final String TAG = "phiola.PlaylistAdapter";
private final Core core;
private final Queue queue;
private final LayoutInflater inflater;
@@ -73,7 +72,7 @@ public int getItemCount() {
if (view_explorer)
return explorer.count();
- return queue.visiblelist_itemcount();
+ return queue.visible_items();
}
static final int EV_LONGCLICK = 1;
@@ -87,10 +86,11 @@ void on_event(int ev, int i) {
if (ev == EV_LONGCLICK)
return;
- queue.visiblelist_play(i);
+ queue.visible_play(i);
}
void on_change(int how, int pos) {
+ core.dbglog(TAG, "on_change: %d %d", how, pos);
if (pos < 0)
notifyDataSetChanged();
else if (how == QueueNotify.UPDATE)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
index 91ebb2c..63d5d68 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
@@ -28,7 +28,7 @@ class PhiolaQueue {
void destroy() { phi.quDestroy(q); }
- void dup(long q_src, int pos) {
+ void copy_entries(long q_src, int pos) {
phi.quDup(q, q_src, pos);
modified = true;
}
@@ -228,7 +228,7 @@ int new_list() {
return queues.size() - 1;
}
- int close_current_list() {
+ int current_close() {
if (i_selected == i_conversion && converting)
return E_BUSY; // can't close the conversion list while the conversion is in progress
@@ -236,7 +236,7 @@ int close_current_list() {
if (i_conversion >= 0)
n_playlists--;
if (n_playlists == 1 && i_selected != i_conversion) {
- clear();
+ current_clear();
return 0;
}
@@ -245,6 +245,8 @@ int close_current_list() {
queues.remove(i_selected);
if (i_active == i_selected)
i_active = 0;
+ else if (i_active > i_selected)
+ i_active--;
if (i_selected == i_conversion)
i_conversion = -1;
@@ -327,7 +329,7 @@ void saveconf() {
}
/** Save playlist to a file */
- boolean save(String fn) {
+ boolean current_save(String fn) {
if (!q_selected().save(fn))
return false;
core.dbglog(TAG, "saved %s", fn);
@@ -344,7 +346,7 @@ private int index_next(int qi) {
/** Change to next playlist */
int next_list_select() {
- filter("");
+ current_filter("");
i_selected = index_next(i_selected);
queues.get(i_selected).load_once();
return i_selected;
@@ -357,8 +359,8 @@ void switch_list(int i) {
queues.get(i_selected).load_once();
}
- int current_list_index() { return i_selected; }
- long current_list_id() { return queues.get(i_selected).q; }
+ int current_index() { return i_selected; }
+ long current_id() { return queues.get(i_selected).q; }
/** Add currently playing track to next list.
Return the modified list index. */
@@ -390,7 +392,7 @@ private void nfy_all(int how, int first_pos) {
}
/** Play track at cursor */
- void playcur() {
+ void active_play() {
int pos = curpos;
if (pos < 0)
pos = 0;
@@ -410,11 +412,11 @@ private void _play(int iq, int it) {
}
/** Play track at the specified position */
- void play(int index) {
+ void current_play(int index) {
_play(i_selected, index);
}
- void visiblelist_play(int i) {
+ void visible_play(int i) {
if (i_selected == i_conversion)
return; // ignore click on entry in Conversion list
@@ -471,7 +473,12 @@ private void play_on_close(TrackHandle t) {
auto_stop_active = false;
}
- String get(int i) { return phi.quEntry(queues.get(i_selected).q, i); }
+ String active_track_url() {
+ if (i_selected != i_active
+ || trk_idx < 0)
+ return null;
+ return phi.quEntry(queues.get(i_selected).q, trk_idx);
+ }
String display_line(int i) {
return phi.quDisplayLine(q_visible().q, i);
@@ -481,14 +488,13 @@ int move_all(String dst_dir) {
return phi.quMoveAll(q_visible().q, dst_dir);
}
- void remove(int pos) {
+ void active_remove(int pos) {
core.dbglog(TAG, "remove: %d:%d", i_active, pos);
filter_close();
queues.get(i_active).remove(pos);
}
- /** Clear playlist */
- void clear() {
+ void current_clear() {
core.dbglog(TAG, "clear");
filter_close();
queues.get(i_selected).clear();
@@ -496,22 +502,24 @@ void clear() {
trk_idx = -1;
}
- void rm_non_existing() {
+ void current_remove_non_existing() {
queues.get(i_selected).remove_non_existing();
}
int number() { return queues.size(); }
/** Get tracks number in the currently selected (not filtered) list */
- int count() { return queues.get(i_selected).count(); }
+ int current_items() { return queues.get(i_selected).count(); }
- int visiblelist_itemcount() { return q_visible().count(); }
+ int visible_items() { return q_visible().count(); }
- static final int ADD_RECURSE = 1;
- static final int ADD = 2;
+ static final int
+ ADD_RECURSE = 1,
+ ADD = 2;
- void addmany(String[] urls, int flags) {
+ void current_addmany(String[] urls, int flags) {
filter_close();
+ queues.get(i_selected).load_once();
int f = 0;
if (flags == ADD_RECURSE)
f = Phiola.QUADD_RECURSE;
@@ -519,10 +527,10 @@ void addmany(String[] urls, int flags) {
}
/** Add an entry */
- void add(String url) {
- core.dbglog(TAG, "add: %s", url);
- filter_close();
- queues.get(i_selected).add(url, 0);
+ void current_add(String url, int flags) {
+ String[] urls = new String[1];
+ urls[0] = url;
+ current_addmany(urls, flags);
}
String conf_write() {
@@ -568,29 +576,25 @@ void conf_normalize() {
}
/** Get currently playing track index */
- int active_track_pos() {
+ int active_pos() {
if (i_selected != i_active)
return -1;
return trk_idx;
}
- String[] meta(int i) {
- if (i == -1)
- i = trk_idx;
- Phiola.Meta m = phi.quMeta(queues.get(i_active).q, i);
+ String[] active_meta() {
+ Phiola.Meta m = phi.quMeta(queues.get(i_active).q, trk_idx);
if (m == null)
return null;
return m.meta;
}
- void sort(int flags) {
+ void current_sort(int flags) {
if (q_filtered != null) return;
q_selected().sort(flags);
}
- long q_active_id() { return queues.get(i_active).q; }
-
/** Currently selected (not filtered) list */
private PhiolaQueue q_selected() { return queues.get(i_selected); }
@@ -609,7 +613,7 @@ private void filter_close() {
}
/** Create filtered list */
- void filter(String filter) {
+ void current_filter(String filter) {
PhiolaQueue newqf = null;
if (!filter.isEmpty()) {
PhiolaQueue qcur = queues.get(i_selected);
@@ -658,7 +662,7 @@ int convert_add(int flags) {
queues.add(new PhiolaQueue(core.phiola, Phiola.QUNF_CONVERSION, 0));
i_conversion = queues.size() - 1;
- queues.get(i_conversion).dup(q_src, i);
+ queues.get(i_conversion).copy_entries(q_src, i);
i_selected = i_conversion;
return i_conversion;
}
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Svc.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Svc.java
index 0cae557..7ce6ca5 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Svc.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Svc.java
@@ -126,7 +126,7 @@ void sess_init() {
public void onPlay() {
core.dbglog(TAG, "MediaSessionCompat.onPlay");
if (track.state() == Track.STATE_NONE) {
- queue.playcur();
+ queue.active_play();
return;
}
track.unpause();
@@ -280,7 +280,7 @@ int new_track(TrackHandle t) {
startService(new Intent(this, Svc.class));
}
- pstate.setActiveQueueItemId(queue.active_track_pos());
+ pstate.setActiveQueueItemId(queue.active_pos());
String title = t.pmeta.title;
if (t.pmeta.title.isEmpty())
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/TagsActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/TagsActivity.java
index 9bf25d2..e355bef 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/TagsActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/TagsActivity.java
@@ -39,7 +39,7 @@ protected void onDestroy() {
}
private void show() {
- meta = core.queue().meta(-1);
+ meta = core.queue().active_meta();
if (meta == null)
meta = new String[0];
ArrayList tags = new ArrayList<>();
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/UtilNative.java b/android/phiola/src/main/java/com/github/stsaz/phiola/UtilNative.java
index f4f69ca..1a44f7e 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/UtilNative.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/UtilNative.java
@@ -53,10 +53,8 @@ static class Entry {
UI_CURPATH = REC_UNTIL + 1,
UI_FILTER_HIDE = UI_CURPATH + 1,
UI_INFO_IN_TITLE = UI_FILTER_HIDE + 1,
- UI_LIST_SCROLL_POS0 = UI_INFO_IN_TITLE + 1,
- UI_LIST_SCROLL_POS1 = UI_LIST_SCROLL_POS0 + 1,
- UI_LIST_SCROLL_POS2 = UI_LIST_SCROLL_POS1 + 1,
- UI_RECORD_HIDE = UI_LIST_SCROLL_POS2 + 1,
+ UI_LIST_SCROLL_POS = UI_INFO_IN_TITLE + 1,
+ UI_RECORD_HIDE = UI_LIST_SCROLL_POS + 1,
UI_STATE_HIDE = UI_RECORD_HIDE + 1,
UI_SVC_NOTFN_DISABLE = UI_STATE_HIDE + 1,
UI_THEME = UI_SVC_NOTFN_DISABLE+1
diff --git a/src/format/ts-read.c b/src/format/ts-read.c
index 56c609f..794e905 100644
--- a/src/format/ts-read.c
+++ b/src/format/ts-read.c
@@ -55,7 +55,7 @@ static int ts_info(struct ts_r *c, phi_track *t, const struct _tsr_pm *info)
case TS_STREAM_AUDIO_AAC:
mod = "format.aac"; break;
default:
- dbglog(t, "codec not supported: %u", info->stream_type);
+ errlog(t, "codec not supported: %u", info->stream_type);
return 1;
}
if (!core->track->filter(t, core->mod(mod), 0))
@@ -87,12 +87,8 @@ static int ts_process(void *ctx, phi_track *t)
case TSREAD_DATA:
if (c->n_pkt == 0) {
- // select the first audio track with a recognized codec
- r = ts_info(c, t, tsread_info(&c->ts));
- if (r < 0)
+ if (ts_info(c, t, tsread_info(&c->ts)))
return PHI_ERR;
- else if (r > 0)
- continue;
}
if (c->track_id != tsread_info(&c->ts)->pid)
diff --git a/src/jni/android-utils.h b/src/jni/android-utils.h
index b106394..89fb118 100644
--- a/src/jni/android-utils.h
+++ b/src/jni/android-utils.h
@@ -49,9 +49,7 @@ static const char setting_names[][20] = {
"ui_curpath",
"ui_filter_hide",
"ui_info_in_title",
- "ui_list_scroll_pos0",
- "ui_list_scroll_pos1",
- "ui_list_scroll_pos2",
+ "ui_list_scroll_pos",
"ui_record_hide",
"ui_state_hide",
"ui_svc_notfn_disable",
diff --git a/src/jni/phiola-jni.c b/src/jni/phiola-jni.c
index 3ed6445..90a1807 100644
--- a/src/jni/phiola-jni.c
+++ b/src/jni/phiola-jni.c
@@ -52,6 +52,9 @@ struct phiola_jni {
uint n_tracks_updated;
} convert;
+ phi_timer tmr_q_draw;
+ phi_queue_id q_adding;
+
jclass Phiola_class;
jmethodID Phiola_lib_load;
diff --git a/src/jni/queue.h b/src/jni/queue.h
index ae9b619..1a2bdd4 100644
--- a/src/jni/queue.h
+++ b/src/jni/queue.h
@@ -3,12 +3,42 @@
static void qu_conv_update(phi_queue_id q);
+static void list_redraw_delayed(void *param)
+{
+ JNIEnv *env;
+ int r = jni_vm_attach(jvm, &env);
+ if (r) {
+ errlog("jni_vm_attach: %d", r);
+ goto end;
+ }
+
+ jni_call_void(x->obj_QueueCallback, x->Phiola_QueueCallback_on_change, (jlong)x->q_adding, 'u', 0);
+
+end:
+ jni_vm_detach(jvm);
+ x->q_adding = 0;
+}
+
static void qu_on_change(phi_queue_id q, uint flags, uint pos)
{
- dbglog("%s: '%c' q:%p", __func__, flags, (size_t)q);
+ dbglog("%s: '%c' q:%p pos:%u", __func__, flags, (size_t)q, pos);
switch (flags) {
case 'a':
+ if (q == x->q_adding)
+ return; // redraw timer is already set
+ if (!x->q_adding) {
+ x->q_adding = q;
+ x->core->timer(0, &x->tmr_q_draw, -50, list_redraw_delayed, NULL);
+ return; // delay redrawing this list
+ }
+
+ // redraw the previously modified list
+ q = FF_SWAP(&x->q_adding, q);
+ flags = 'u';
+ pos = 0;
+ break;
+
case 'r':
case 'c':
case 'u':
@@ -409,7 +439,7 @@ static void display_name_prepare(ffstr *val, ffsize cap, struct phi_queue_entry
JNIEXPORT jstring JNICALL
Java_com_github_stsaz_phiola_Phiola_quDisplayLine(JNIEnv *env, jobject thiz, jlong jq, jint i)
{
- dbglog("%s: enter", __func__);
+ dbglog("%s: enter %p %d", __func__, jq, i);
phi_queue_id q = (phi_queue_id)jq;
char buf[256];
ffstr val = {};
diff --git a/src/net/hls.h b/src/net/hls.h
index 3789fd6..0ffd480 100644
--- a/src/net/hls.h
+++ b/src/net/hls.h
@@ -164,13 +164,6 @@ static int hls_q_get(struct httpcl *h, ffstr *name)
static void hls_f_request(struct httpcl *h, ffstr name)
{
struct hlsread *l = h->hls;
- nml_http_client_free(h->cl);
- ffstr_free(&h->conf.headers);
- ffmem_zero_obj(&h->conf);
-
- h->cl = nml_http_client_create();
-
- struct nml_http_client_conf *c = &h->conf;
ffstr url = FFSTR_Z(h->trk->conf.ifile.name);
l->data_file = 0;
if (name.len) {
@@ -189,10 +182,7 @@ static void hls_f_request(struct httpcl *h, ffstr name)
}
}
- conf_prepare(h, c, h->trk, url);
- dbglog(h->trk, "requesting %S", &url);
- nml_http_client_conf(h->cl, c);
- nml_http_client_run(h->cl);
+ http_request(h, url);
}
static void hls_f_next(void *param)
diff --git a/src/net/http.c b/src/net/http.c
index 8c679eb..f90684d 100644
--- a/src/net/http.c
+++ b/src/net/http.c
@@ -50,6 +50,7 @@ enum ST {
};
static int conf_prepare(struct httpcl *h, struct nml_http_client_conf *c, phi_track *t, ffstr url);
+static void http_request(struct httpcl *h, ffstr url);
#include
static void nml_log(void *log_obj, uint level, const char *ctx, const char *id, const char *format, ...)
diff --git a/src/tui/help.txt b/src/tui/help.txt
index edc34fe..89e7d97 100644
--- a/src/tui/help.txt
+++ b/src/tui/help.txt
@@ -20,6 +20,9 @@ Down Volume down
m Mute
i Show tags
+d Remove current track from playlist
+x Remove current track from playlist and play next track
r "Choose random track" setting: on/off
+Shift+l Save playlist to disk
h Show help
q Quit
diff --git a/src/tui/tui.c b/src/tui/tui.c
index 664a598..f32ea38 100644
--- a/src/tui/tui.c
+++ b/src/tui/tui.c
@@ -408,6 +408,8 @@ static void tui_cmd_read(void *param)
void *udata = NULL;
if (k->cmd & _CMD_F3)
udata = (void*)(ffsize)key;
+ else if (key & FFKEY_MODMASK)
+ continue;
tui_corecmd_add(k, udata);
} else if (k->cmd & _CMD_F1) {
From 7b4903a6c7a123442d8127f788eb078fa759b72f Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 30 Nov 2024 08:57:42 +0300
Subject: [PATCH 33/59] v2.3-beta2
---
android/phiola/build.gradle | 4 ++--
src/phiola.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/android/phiola/build.gradle b/android/phiola/build.gradle
index 59ff8d9..b125556 100644
--- a/android/phiola/build.gradle
+++ b/android/phiola/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.github.stsaz.phiola"
minSdkVersion 16
targetSdk 33
- versionCode 20301
- versionName '2.3-beta1'
+ versionCode 20302
+ versionName '2.3-beta2'
}
buildFeatures {
diff --git a/src/phiola.h b/src/phiola.h
index 59401eb..da593a0 100644
--- a/src/phiola.h
+++ b/src/phiola.h
@@ -6,7 +6,7 @@
#include
#include
-#define PHI_VERSION 20301
+#define PHI_VERSION 20302
/** Inter-module compatibility version.
It must be updated when incompatible changes are made to this file,
From f9cc5ba36fa014bc5e3fbbc3b6b855caffb7ecc5 Mon Sep 17 00:00:00 2001
From: Simon Zolin <4729655+stsaz@users.noreply.github.com>
Date: Sat, 21 Dec 2024 10:35:02 +0300
Subject: [PATCH 34/59] + Android: new command `List: Move Left`
---
.../java/com/github/stsaz/phiola/GUI.java | 7 +++++++
.../com/github/stsaz/phiola/MainActivity.java | 9 +++++++++
.../java/com/github/stsaz/phiola/Phiola.java | 6 ++++++
.../java/com/github/stsaz/phiola/Queue.java | 20 +++++++++++++++++++
android/phiola/src/main/res/menu/list.xml | 3 +++
.../phiola/src/main/res/values/strings.xml | 1 +
src/core/queue.c | 14 +++++++++++++
src/jni/queue.h | 17 ++++++++++++++++
src/phiola.h | 5 ++++-
9 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java b/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java
index 304b6dd..546ff26 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/GUI.java
@@ -106,6 +106,13 @@ void list_scroll_pos_set(int i, int n) {
list_pos.set(i, n);
}
+ void list_scroll_pos_swap(int a, int b) {
+ int aa = list_scroll_pos(a);
+ int bb = list_scroll_pos(b);
+ list_scroll_pos_set(a, bb);
+ list_scroll_pos_set(b, aa);
+ }
+
void on_error(String fmt, Object... args) {
if (cur_activity == null)
return;
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
index 9721bd8..ed35995 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java
@@ -218,6 +218,15 @@ private boolean list_menu_click(MenuItem item) {
case R.id.action_list_sort:
list_sort_menu_show(); break;
+ case R.id.action_move_left: {
+ int i = queue.current_move_left();
+ if (i >= 0) {
+ gui.list_scroll_pos_swap(i, i + 1);
+ bplaylist_text(i);
+ }
+ break;
+ }
+
case R.id.action_list_convert:
list_convert(); break;
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
index 5727b7b..a3e23de 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Phiola.java
@@ -122,6 +122,12 @@ interface QueueCallback {
native long quNew(int flags);
native void quDestroy(long q);
+ /** Move the list to a new position. */
+ native void quMove(int from, int to);
+
+ /** Copy entries from another queue (asynchronous).
+ pos: Source entry index
+ -1: Copy all entries */
native void quDup(long q, long q_src, int pos);
static final int QUADD_RECURSE = 1;
diff --git a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
index 63d5d68..c0b8da2 100644
--- a/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
+++ b/android/phiola/src/main/java/com/github/stsaz/phiola/Queue.java
@@ -5,6 +5,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Timer;
import java.util.TimerTask;
@@ -533,6 +534,25 @@ void current_add(String url, int flags) {
current_addmany(urls, flags);
}
+ int current_move_left() {
+ if (i_selected == 0) return -1;
+
+ int nu = i_selected - 1;
+ phi.quMove(i_selected, nu);
+ queues.get(i_selected).modified = true;
+ queues.get(nu).load_once();
+ queues.get(nu).modified = true;
+ Collections.swap(queues, i_selected, nu);
+
+ if (i_active == i_selected)
+ i_active--;
+ else if (i_active == nu)
+ i_active++;
+
+ i_selected--;
+ return nu;
+ }
+
String conf_write() {
return String.format(
"list_curpos %d\n"
diff --git a/android/phiola/src/main/res/menu/list.xml b/android/phiola/src/main/res/menu/list.xml
index 27f4af0..3d42352 100644
--- a/android/phiola/src/main/res/menu/list.xml
+++ b/android/phiola/src/main/res/menu/list.xml
@@ -32,6 +32,9 @@