Skip to content

Commit 02c096f

Browse files
stsazstsaz
committed
ref
1 parent 609cc63 commit 02c096f

File tree

9 files changed

+324
-283
lines changed

9 files changed

+324
-283
lines changed

‎alib3/mp3lame/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ $(DIR): $(PKG)
2323
$(UNTAR_GZ) $(PKG)
2424
touch $@
2525

26-
_=
26+
CONFIGURE_FLAGS := --host=x86_64
2727
ifeq "$(CPU)" "arm64"
2828
CONFIGURE_FLAGS := --host=aarch64-linux-gnu
29+
else ifeq "$(CPU)" "arm64"
2930
endif
3031
ifeq "$(SYS)" "android"
3132
CONFIGURE_ENV := CC="$(C_DIR)/clang" CFLAGS="$(A_CFLAGS)"

‎android/phiola/src/main/java/com/github/stsaz/phiola/ConvertActivity.java‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
3636
}));
3737

3838
ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item
39-
, CoreSettings.conv_format_display);
39+
, ConvertSettings.conv_format_display);
4040
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
4141
b.spOutExt.setAdapter(adapter);
4242

@@ -64,7 +64,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
6464
b.bUntilSetCur.setOnClickListener((v) -> pos_set_cur(false));
6565

6666
adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item
67-
, CoreSettings.conv_sample_formats_str);
67+
, ConvertSettings.conv_sample_formats_str);
6868
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
6969
b.spSampleFormat.setAdapter(adapter);
7070

@@ -137,8 +137,8 @@ private String time_str(long sec) {
137137
}
138138

139139
private int conv_format_index(String name) {
140-
for (int i = 0; i < CoreSettings.conv_formats.length; i++) {
141-
if (CoreSettings.conv_formats[i].equals(name))
140+
for (int i = 0; i < ConvertSettings.conv_formats.length; i++) {
141+
if (ConvertSettings.conv_formats[i].equals(name))
142142
return i;
143143
}
144144
return -1;
@@ -171,22 +171,22 @@ private int aac_q_read(String s) {
171171
private static int opus_q_progress(int q) { return (q - 16) / 16; }
172172

173173
private void load() {
174-
b.eOutDir.setText(core.setts.conv_out_dir);
175-
b.eOutName.setText(core.setts.conv_out_name);
176-
b.spOutExt.setSelection(conv_format_index(core.setts.conv_format));
174+
b.eOutDir.setText(core.convert.conv_out_dir);
175+
b.eOutName.setText(core.convert.conv_out_name);
176+
b.spOutExt.setSelection(conv_format_index(core.convert.conv_format));
177177

178-
b.sbAacQ.setProgress(aac_q_progress(core.setts.conv_aac_quality));
179-
b.eAacQ.setText(core.int_to_str(core.setts.conv_aac_quality));
178+
b.sbAacQ.setProgress(aac_q_progress(core.convert.conv_aac_quality));
179+
b.eAacQ.setText(core.int_to_str(core.convert.conv_aac_quality));
180180

181-
b.sbOpusQ.setProgress(opus_q_progress(core.setts.conv_opus_quality));
182-
b.eOpusQ.setText(core.int_to_str(core.setts.conv_opus_quality));
181+
b.sbOpusQ.setProgress(opus_q_progress(core.convert.conv_opus_quality));
182+
b.eOpusQ.setText(core.int_to_str(core.convert.conv_opus_quality));
183183

184-
b.eMp3Q.setText(core.int_to_str(core.setts.conv_mp3_quality));
184+
b.eMp3Q.setText(core.int_to_str(core.convert.conv_mp3_quality));
185185

186-
b.swCopy.setChecked(core.setts.conv_copy);
186+
b.swCopy.setChecked(core.convert.conv_copy);
187187

188-
b.swPreserveDate.setChecked(core.setts.conv_file_date_preserve);
189-
b.swPlAdd.setChecked(core.setts.conv_new_add_list);
188+
b.swPreserveDate.setChecked(core.convert.conv_file_date_preserve);
189+
b.swPlAdd.setChecked(core.convert.conv_new_add_list);
190190
}
191191

192192
private void save() {
@@ -195,38 +195,38 @@ private void save() {
195195
s = "@filepath";
196196
b.eOutDir.setText(s);
197197
}
198-
core.setts.conv_out_dir = s;
198+
core.convert.conv_out_dir = s;
199199

200200
s = b.eOutName.getText().toString();
201201
if (s.isEmpty()) {
202202
s = "@filename";
203203
b.eOutName.setText(s);
204204
}
205-
core.setts.conv_out_name = s;
205+
core.convert.conv_out_name = s;
206206

207-
core.setts.conv_format = CoreSettings.conv_formats[b.spOutExt.getSelectedItemPosition()];
208-
core.setts.conv_copy = b.swCopy.isChecked();
207+
core.convert.conv_format = ConvertSettings.conv_formats[b.spOutExt.getSelectedItemPosition()];
208+
core.convert.conv_copy = b.swCopy.isChecked();
209209

210210
int v = aac_q_read(b.eAacQ.getText().toString());
211211
if (v != 0)
212-
core.setts.conv_aac_quality = v;
212+
core.convert.conv_aac_quality = v;
213213

214214
v = core.str_to_uint(b.eOpusQ.getText().toString(), 0);
215215
if (v != 0)
216-
core.setts.conv_opus_quality = v;
216+
core.convert.conv_opus_quality = v;
217217

218218
v = core.str_to_uint(b.eMp3Q.getText().toString(), -1);
219219
if (v >= 0)
220-
core.setts.conv_mp3_quality = v;
220+
core.convert.conv_mp3_quality = v;
221221

222-
core.setts.conv_file_date_preserve = b.swPreserveDate.isChecked();
223-
core.setts.conv_new_add_list = b.swPlAdd.isChecked();
222+
core.convert.conv_file_date_preserve = b.swPreserveDate.isChecked();
223+
core.convert.conv_new_add_list = b.swPlAdd.isChecked();
224224
}
225225

226226
@Override
227227
protected void onDestroy() {
228228
save();
229-
core.setts.normalize_convert();
229+
core.convert.normalize();
230230
core.unref();
231231
super.onDestroy();
232232
}
@@ -254,23 +254,23 @@ private void convert() {
254254
p.from_msec = b.eFrom.getText().toString();
255255
p.to_msec = b.eUntil.getText().toString();
256256
p.tags = b.eTags.getText().toString();
257-
p.sample_format = CoreSettings.conv_sample_formats[b.spSampleFormat.getSelectedItemPosition()];
257+
p.sample_format = ConvertSettings.conv_sample_formats[b.spSampleFormat.getSelectedItemPosition()];
258258
p.sample_rate = core.str_to_uint(b.eSampleRate.getText().toString(), 0);
259-
p.aac_quality = core.setts.conv_aac_quality;
260-
p.opus_quality = core.setts.conv_opus_quality;
261-
p.mp3_quality = core.setts.conv_mp3_quality;
259+
p.aac_quality = core.convert.conv_aac_quality;
260+
p.opus_quality = core.convert.conv_opus_quality;
261+
p.mp3_quality = core.convert.conv_mp3_quality;
262262

263263
int iformat = b.spOutExt.getSelectedItemPosition();
264-
p.format = CoreSettings.conv_encoders[iformat];
264+
p.format = ConvertSettings.conv_encoders[iformat];
265265

266-
if (core.setts.conv_copy)
266+
if (core.convert.conv_copy)
267267
p.flags |= Phiola.ConvertParams.COF_COPY;
268-
if (core.setts.conv_file_date_preserve)
268+
if (core.convert.conv_file_date_preserve)
269269
p.flags |= Phiola.ConvertParams.COF_DATE_PRESERVE;
270270
if (b.swOutOverwrite.isChecked() && b.swOutOverwriteConfirm.isChecked())
271271
p.flags |= Phiola.ConvertParams.COF_OVERWRITE;
272272

273-
if (core.setts.conv_new_add_list) {
273+
if (core.convert.conv_new_add_list) {
274274
p.q_add_remove = getIntent().getLongExtra("current_list_id", 0);
275275
p.flags |= Phiola.ConvertParams.COF_ADD;
276276
}
@@ -282,7 +282,7 @@ private void convert() {
282282
}
283283

284284
p.out_name = String.format("%s/%s.%s"
285-
, core.setts.conv_out_dir, core.setts.conv_out_name, CoreSettings.conv_extensions[iformat]);
285+
, core.convert.conv_out_dir, core.convert.conv_out_name, ConvertSettings.conv_extensions[iformat]);
286286

287287
String r = core.queue().convert_begin(p);
288288
if (r != null) {

‎android/phiola/src/main/java/com/github/stsaz/phiola/Core.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ class Core extends Util {
3535
String work_dir;
3636
Context context;
3737
CoreSettings setts;
38+
RecSettings rec;
39+
ConvertSettings convert;
3840

3941
static Core getInstance() {
4042
instance.dbglog(TAG, "getInstance");
@@ -68,6 +70,8 @@ private void init(@NonNull Context ctx) {
6870
util = new UtilNative(phiola);
6971
util.storagePaths(storage_paths);
7072
setts = new CoreSettings(this);
73+
rec = new RecSettings(this);
74+
convert = new ConvertSettings(this);
7175
gui = new GUI(this);
7276
track = new Track(this);
7377
qu = new Queue(this);
@@ -107,6 +111,8 @@ GUI gui() {
107111
void saveconf() {
108112
StringBuilder sb = new StringBuilder();
109113
sb.append(this.setts.conf_write());
114+
sb.append(this.rec.conf_write());
115+
sb.append(this.convert.conf_write());
110116
sb.append(qu.conf_write());
111117
sb.append(gui.conf_write());
112118
dbglog(TAG, "%s", sb.toString());
@@ -117,12 +123,16 @@ void saveconf() {
117123
private void loadconf() {
118124
if (conf.confRead(conf_file_name())) {
119125
setts.conf_load(conf);
126+
rec.conf_load(conf);
127+
convert.conf_load(conf);
120128
qu.conf_load(conf);
121129
gui.conf_load(conf);
122130
conf.reset();
123131
}
124132

125133
setts.normalize();
134+
rec.normalize();
135+
convert.normalize();
126136
qu.conf_normalize();
127137
phiola.setConfig(setts.codepage, setts.deprecated_mods);
128138
}

‎android/phiola/src/main/java/com/github/stsaz/phiola/MainActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ protected void onCreate(Bundle savedInstanceState) {
6363
if (gui.cur_path.isEmpty())
6464
gui.cur_path = core.storage_path;
6565

66-
if (core.setts.rec_path.isEmpty())
67-
core.setts.rec_path = core.storage_path + "/Recordings";
66+
if (core.rec.rec_path.isEmpty())
67+
core.rec.rec_path = core.storage_path + "/Recordings";
6868

6969
// Add file to the playlist and start playback if executed from an external file manager app
7070
String ia = getIntent().getAction();
@@ -442,15 +442,15 @@ private void init_ui() {
442442
b.brec.setOnClickListener((v) -> {
443443
if (gui.playback_marker_show)
444444
playback_marker_jump();
445-
else if (core.setts.rec_longclick)
445+
else if (core.rec.rec_longclick)
446446
rec_pause_toggle();
447447
else
448448
rec_start_stop();
449449
});
450450
b.brec.setOnLongClickListener((v) -> {
451451
if (gui.playback_marker_show)
452452
playback_marker_set();
453-
else if (core.setts.rec_longclick)
453+
else if (core.rec.rec_longclick)
454454
rec_start_stop();
455455
return true;
456456
});
@@ -621,7 +621,7 @@ private void rec_state_set(boolean active) {
621621
private void rec_fin(int code, String filename) {
622622
stopService(new Intent(this, RecSvc.class));
623623
if (code == 0) {
624-
if (core.setts.rec_list_add)
624+
if (core.rec.rec_list_add)
625625
queue.current_add(filename, 0);
626626
gui.msg_show(this, getString(R.string.main_rec_fin));
627627
}

0 commit comments

Comments
 (0)