Added channel allocation mode field

Wohlstand · Wohlstand · commit 5ef2041e27ac · 2023-01-02T13:40:11.000+03:00
diff --git a/ADLMIDI-Player/src/main/cpp/adlmidi-jni.c b/ADLMIDI-Player/src/main/cpp/adlmidi-jni.c
@@ -742,6 +742,20 @@ Java_ru_wohlsoft_adlmidiplayer_PlayerService_adl_1setVolumeRangeModel(
     pthread_mutex_unlock(&g_lock);
 }
 
+JNIEXPORT void JNICALL
+Java_ru_wohlsoft_adlmidiplayer_PlayerService_adl_1setChannelAllocMode(
+    JNIEnv *env,
+    jclass instance,
+    jlong device,
+    jint chanAlloc
+)
+{
+    (void)env; (void)instance;
+    pthread_mutex_lock(&g_lock);
+    adl_setChannelAllocMode(ADL_DEV, (int)chanAlloc);
+    pthread_mutex_unlock(&g_lock);
+}
+
 JNIEXPORT jint JNICALL
 Java_ru_wohlsoft_adlmidiplayer_PlayerService_adl_1setRunAtPcmRate(
     JNIEnv *env,
diff --git a/ADLMIDI-Player/src/main/java/ru/wohlsoft/adlmidiplayer/AppSettings.java b/ADLMIDI-Player/src/main/java/ru/wohlsoft/adlmidiplayer/AppSettings.java
@@ -14,7 +14,7 @@ public class AppSettings
     static private int                 m_ADL_bank = 58;
     static private int                 m_ADL_tremolo = -1;
     static private int                 m_ADL_vibrato = -1;
-    static private int                 m_ADL_scalable = -1;
+    static private int                 m_ADL_scalable = 0;
     static private int                 m_ADL_softPanEnabled = 0;
     // Default 1 for performance reasons
     static private int                 m_ADL_runAtPcmRate = 1;
@@ -25,6 +25,7 @@ public class AppSettings
     static private int                 m_adl_numChips = 2;
     static private int                 m_ADL_num4opChannels = -1;
     static private int                 m_ADL_volumeModel = 0;
+    static private int                 m_ADL_chanAllocMode = 0;
 
     static private double              m_gainingLevel = 2.0;
 
@@ -41,7 +42,7 @@ static public void loadSetup(SharedPreferences setup)
             m_ADL_bank = setup.getInt("adlBank", m_ADL_bank);
             m_ADL_tremolo = setup.getBoolean("flagTremolo", m_ADL_tremolo > 0) ? 1 : -1;
             m_ADL_vibrato = setup.getBoolean("flagVibrato", m_ADL_vibrato > 0) ? 1 : -1;
-            m_ADL_scalable = setup.getBoolean("flagScalable", m_ADL_scalable > 0) ? 1 : -1;
+            m_ADL_scalable = setup.getBoolean("flagScalable", m_ADL_scalable > 0) ? 1 : 0;
             m_ADL_softPanEnabled = setup.getBoolean("flagSoftPan", m_ADL_softPanEnabled > 0) ? 1 : 0;
             m_ADL_runAtPcmRate = setup.getBoolean("flagRunAtPcmRate", m_ADL_runAtPcmRate > 0) ? 1 : 0;
             m_ADL_autoArpeggio = setup.getBoolean("flagAutoArpeggio", m_ADL_autoArpeggio > 0) ? 1 : 0;
@@ -50,6 +51,7 @@ static public void loadSetup(SharedPreferences setup)
             m_adl_numChips = setup.getInt("numChips", m_adl_numChips);
             m_ADL_num4opChannels = setup.getInt("num4opChannels", m_ADL_num4opChannels);
             m_ADL_volumeModel = setup.getInt("volumeModel", m_ADL_volumeModel);
+            m_ADL_chanAllocMode = setup.getInt("chanAllocMode", m_ADL_chanAllocMode);
 
             m_gainingLevel = (double)setup.getFloat("gaining", (float)m_gainingLevel);
         }
@@ -104,6 +106,18 @@ static public int getVolumeModel()
     }
 
 
+    static public void setChanAllocMode(int chanAllocMode)
+    {
+        m_ADL_chanAllocMode = chanAllocMode;
+        m_setup.edit().putInt("chanAllocMode", m_ADL_chanAllocMode).apply();
+    }
+
+    static public int getChanAlocMode()
+    {
+        return m_ADL_chanAllocMode;
+    }
+
+
     static public void setDeepTremolo(boolean flag)
     {
         m_ADL_tremolo = flag ? 1 : -1;
@@ -136,7 +150,7 @@ static public int getDeepVibratoRaw()
 
     static public void setScalableModulators(boolean flag)
     {
-        m_ADL_scalable = flag ? 1 : -1;
+        m_ADL_scalable = flag ? 1 : 0;
         m_setup.edit().putBoolean("flagScalable", flag).apply();
     }
 
diff --git a/ADLMIDI-Player/src/main/java/ru/wohlsoft/adlmidiplayer/Player.java b/ADLMIDI-Player/src/main/java/ru/wohlsoft/adlmidiplayer/Player.java
@@ -126,6 +126,7 @@ public void onServiceDisconnected(ComponentName arg0)
         }
     };
 
+    @SuppressLint("SetTextI18n")
     private void initUiSetup(boolean fromConnect)
     {
         boolean isPlaying = false;
@@ -142,7 +143,7 @@ private void initUiSetup(boolean fromConnect)
             Log.d(LOG_TAG, "\"bound\" set to true");
             isPlaying = m_service.isPlaying();
 
-            if (isPlaying)
+            if(isPlaying)
             {
                 Log.d(LOG_TAG, "Player works, make a toast");
                 seekerStart();
@@ -330,6 +331,31 @@ public void onNothingSelected(AdapterView<?> parent) {
             }
         });
 
+        /*
+         * Channel allocation mode combo-box
+         */
+        Spinner sChanMode = (Spinner) findViewById(R.id.channelAllocationMode);
+        final String[] chanAllocModeItems = {"[Auto]", "Releasing delay", "Released with same instrument", "Any released" };
+
+        ArrayAdapter<String> adapterCA = new ArrayAdapter<>(
+                this, android.R.layout.simple_spinner_item, chanAllocModeItems);
+        adapterCA.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        sChanMode.setAdapter(adapterCA);
+        sChanMode.setSelection(AppSettings.getChanAlocMode());
+
+        sChanMode.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            public void onItemSelected(AdapterView<?> parent,
+                                       View itemSelected, int selectedItemPosition, long selectedId)
+            {
+                AppSettings.setChanAllocMode(selectedItemPosition - 1);
+                if(m_bound)
+                    m_service.setChanAllocMode(selectedItemPosition - 1);
+            }
+
+            public void onNothingSelected(AdapterView<?> parent) {
+            }
+        });
+
 
         /*
          * Deep Tremolo checkbox
@@ -766,7 +792,7 @@ protected void onStop() {
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_MENU) {
 
-            /* **
+            /***
              * TODO: Rpleace this crap with properly made settings box
              * (this one can't receive changed value for "input" EditText field)
              */
@@ -913,6 +939,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         }
     }
 
+
     public void OnOpenBankFileClick(View view)
     {
         // Here, thisActivity is the current activity
@@ -932,15 +959,19 @@ public void openBankDialog()
                 .setOpenDialogListener(new OpenFileDialog.OpenDialogListener()
                 {
                     @Override
-                    public void OnSelectedFile(Context ctx, String fileName, String lastPath) {
+                    public void OnSelectedFile(Context ctx, String fileName, String lastPath)
+                    {
                         m_lastBankPath = fileName;
                         AppSettings.setBankPath(m_lastBankPath);
 
                         TextView cbl = (TextView) findViewById(R.id.bankFileName);
-                        if(!m_lastBankPath.isEmpty()) {
+                        if(!m_lastBankPath.isEmpty())
+                        {
                             File f = new File(m_lastBankPath);
                             cbl.setText(f.getName());
-                        } else {
+                        }
+                        else
+                        {
                             cbl.setText(R.string.noCustomBankLabel);
                         }
                         if(m_bound)
@@ -967,13 +998,13 @@ public void openMusicFileDialog()
                 .setCurrentDirectory(m_lastPath)
                 .setOpenDialogListener(new OpenFileDialog.OpenDialogListener()
                 {
-                    @Override
-                    public void OnSelectedDirectory(Context ctx, String lastPath) {}
-
                     @Override
                     public void OnSelectedFile(Context ctx, String fileName, String lastPath) {
                         processMusicFile(fileName, lastPath);
                     }
+
+                    @Override
+                    public void OnSelectedDirectory(Context ctx, String lastPath) {}
                 });
         fileDialog.show();
     }
@@ -1133,3 +1164,4 @@ void onGainUpdate(double gainLevel, boolean silent)
         gainFactor.setText(String.format(Locale.getDefault(), "%.1f", gainLevel));
     }
 }
+
diff --git a/ADLMIDI-Player/src/main/java/ru/wohlsoft/adlmidiplayer/PlayerService.java b/ADLMIDI-Player/src/main/java/ru/wohlsoft/adlmidiplayer/PlayerService.java
@@ -455,6 +455,7 @@ public void applySetup()
         adl_setScaleModulators(MIDIDevice, AppSettings.getScalableModulationRaw());
         adl_setSoftPanEnabled(MIDIDevice, AppSettings.getFullPanningStereoRaw());
         adl_setVolumeRangeModel(MIDIDevice, AppSettings.getVolumeModel());
+        adl_setChannelAllocMode(MIDIDevice, AppSettings.getChanAlocMode());
         adl_setLoopEnabled(MIDIDevice, 1);
     }
 
@@ -495,6 +496,14 @@ public void setVolumeModel(int volumeModel)
         adl_setVolumeRangeModel(MIDIDevice, volumeModel);
     }
 
+    public void setChanAllocMode(int chanAllocMode)
+    {
+        if(MIDIDevice == 0) {
+            return;
+        }
+        adl_setChannelAllocMode(MIDIDevice, chanAllocMode);
+    }
+
     public void setDeepTremolo(boolean flag)
     {
         if(MIDIDevice == 0) {
@@ -785,6 +794,8 @@ public void playerStop() {
 //    extern void adl_setVolumeRangeModel(struct ADL_MIDIPlayer *device, int volumeModel);
     public static native void adl_setVolumeRangeModel(long device, int volumeModel);
 
+    public static native void adl_setChannelAllocMode(long device, int chanalloc);
+
     public static native int adl_setRunAtPcmRate(long device, int enabled);
 
     public static native int adl_setAutoArpeggio(long device, int enabled);
diff --git a/ADLMIDI-Player/src/main/res/layout/activity_player.xml b/ADLMIDI-Player/src/main/res/layout/activity_player.xml
@@ -195,14 +195,38 @@
             android:minHeight="30dp" />
 
         <TextView
-            android:id="@+id/musicBankLabel"
+            android:id="@+id/channelAllocationModeLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/volumeRangesModel"
             android:layout_alignParentStart="true"
             android:layout_alignParentLeft="true"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:text="@string/chanAllocationMode"
+            tools:text="@string/chanAllocationMode" />
+
+        <Spinner
+            android:id="@+id/channelAllocationMode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/channelAllocationModeLabel"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="15dp"
+            android:minHeight="30dp" />
+
+        <TextView
+            android:id="@+id/musicBankLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/channelAllocationMode"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
             android:text="@string/bankNo"
             tools:text="@string/bankNo" />
 
diff --git a/ADLMIDI-Player/src/main/res/values-en/strings.xml b/ADLMIDI-Player/src/main/res/values-en/strings.xml
@@ -28,4 +28,5 @@
     <string name="emulatorType">OPL3 Emulator</string>
     <string name="noCustomBankLabel"><![CDATA[<No custom bank>]]></string>
     <string name="autoArpeggio">Auto Arpeggio</string>
+    <string name="chanAllocationMode">Channel allocation mode</string>
 </resources>
diff --git a/ADLMIDI-Player/src/main/res/values-fr/strings.xml b/ADLMIDI-Player/src/main/res/values-fr/strings.xml
@@ -27,4 +27,6 @@
     <string name="run_at_pcm_rate">Calculer au taux PCM (charge processeur moindre)</string>
     <string name="emulatorType">Émulateur OPL3</string>
     <string name="noCustomBankLabel"><![CDATA[<No custom bank>]]></string>
+    <string name="autoArpeggio">Arpège automatique</string>
+    <string name="chanAllocationMode">Mode d\'allocation des canaux</string>
 </resources>
diff --git a/ADLMIDI-Player/src/main/res/values-ru/strings.xml b/ADLMIDI-Player/src/main/res/values-ru/strings.xml
@@ -28,4 +28,5 @@
     <string name="emulatorType">Эмулятор OPL3</string>
     <string name="noCustomBankLabel"><![CDATA[<Нет внешнего банка>]]></string>
     <string name="autoArpeggio">Авто-арпеджио</string>
+    <string name="chanAllocationMode">Режим выборки каналов</string>
 </resources>
diff --git a/ADLMIDI-Player/src/main/res/values/strings.xml b/ADLMIDI-Player/src/main/res/values/strings.xml
@@ -31,4 +31,5 @@
     <string name="emulatorType">OPL3 Emulator</string>
     <string name="noCustomBankLabel"><![CDATA[<No custom bank>]]></string>
     <string name="autoArpeggio">Auto Arpeggio</string>
+    <string name="chanAllocationMode">Channel allocation mode</string>
 </resources>
