OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

master: Commit

マスターバージョン


Commit MetaInfo

Revision0406468db317043f3a416ea5103467f406a7d4c5 (tree)
Time2023-03-19 10:17:28
Authorsyntarou <yamanaka.kinoko@gmai...>
Commitersyntarou

Log Message

Commit

Change Summary

Incremental Difference

--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/MXMainWindow.java
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/MXMainWindow.java
@@ -32,6 +32,8 @@ import javax.swing.JTabbedPane;
3232 import jp.synthtarou.midimixer.libs.common.log.MXDebugPrint;
3333 import jp.synthtarou.midimixer.libs.common.MXUtil;
3434 import jp.synthtarou.midimixer.libs.swing.themes.ThemeManagerDialog;
35+import jp.synthtarou.midimixer.mx10input.MX10View;
36+import jp.synthtarou.midimixer.mx60output.MX60View;
3537
3638 /**
3739 *
@@ -224,6 +226,14 @@ public class MXMainWindow extends javax.swing.JFrame {
224226 Component view = jTabbedPane1.getComponentAt(x);
225227 if (view != null) {
226228 view.requestFocusInWindow();
229+ if (view instanceof MX60View) {
230+ MX60View v60 = (MX60View)view;
231+ v60.refreshList();
232+ }
233+ if (view instanceof MX10View) {
234+ MX10View v10 = (MX10View)view;
235+ v10.refreshList();
236+ }
227237 }
228238 }
229239 }
--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/libs/midi/driver/MXDriver_VSTi.java
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/libs/midi/driver/MXDriver_VSTi.java
@@ -98,21 +98,22 @@ public class MXDriver_VSTi implements MXDriver {
9898 return _ownList.getVSTInstance(device).getPath();
9999 }
100100
101- boolean[] flagOpen = new boolean[20];
101+ //boolean[] flagOpen = new boolean[20];
102102
103103 @Override
104- public boolean OutputDeviceIsOpen(int device) {
105- return flagOpen[device];
104+ public boolean OutputDeviceIsOpen(int port) {
105+ //return flagOpen[device];
106+ return _ownList.getVSTInstance(port).isOpen();
106107 }
107108
108109 @Override
109110 public void OutputDeviceQueryOpen(int device, long timeout) {
110- flagOpen[device] = true;
111+ //flagOpen[device] = true;
111112 }
112113
113114 @Override
114115 public void OutputDeviceClose(int device) {
115- flagOpen[device] = false;
116+ //flagOpen[device] = false;
116117 }
117118
118119 @Override
--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/libs/midi/port/MXMIDIOut.java
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/libs/midi/port/MXMIDIOut.java
@@ -316,7 +316,7 @@ public class MXMIDIOut {
316316 }
317317 }
318318 }
319-
319+
320320 public boolean isDriverTypeVSTi() {
321321 if (_device.getDriver() instanceof MXDriver_VSTi) {
322322 return true;
--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx10input/MX10View.form
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx10input/MX10View.form
@@ -40,7 +40,7 @@
4040 <Properties>
4141 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
4242 <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
43- <TitledBorder title="1.Assign Input"/>
43+ <TitledBorder title="1.Input Assign"/>
4444 </Border>
4545 </Property>
4646 </Properties>
@@ -56,7 +56,7 @@
5656 <Properties>
5757 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
5858 <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
59- <TitledBorder title="2.Port Forwarding"/>
59+ <TitledBorder title="2 Input Forwarding"/>
6060 </Border>
6161 </Property>
6262 </Properties>
@@ -74,7 +74,7 @@
7474 <Properties>
7575 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
7676 <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
77- <TitledBorder title="3.Skip Which"/>
77+ <TitledBorder title="3.Input Filter"/>
7878 </Border>
7979 </Property>
8080 </Properties>
--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx10input/MX10View.java
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx10input/MX10View.java
@@ -118,17 +118,17 @@ public class MX10View extends javax.swing.JPanel {
118118
119119 jSplitPane1.setDividerLocation(400);
120120
121- jPanelInputSelect.setBorder(javax.swing.BorderFactory.createTitledBorder("1.Assign Input"));
121+ jPanelInputSelect.setBorder(javax.swing.BorderFactory.createTitledBorder("1.Input Assign"));
122122 jPanelInputSelect.setLayout(new javax.swing.BoxLayout(jPanelInputSelect, javax.swing.BoxLayout.LINE_AXIS));
123123 jSplitPane1.setLeftComponent(jPanelInputSelect);
124124
125- jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder("2.Port Forwarding"));
125+ jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder("2 Input Forwarding"));
126126 jPanel4.setLayout(new javax.swing.BoxLayout(jPanel4, javax.swing.BoxLayout.LINE_AXIS));
127127 jSplitPane1.setBottomComponent(jPanel4);
128128
129129 jSplitPane2.setLeftComponent(jSplitPane1);
130130
131- jPanelSkip.setBorder(javax.swing.BorderFactory.createTitledBorder("3.Skip Which"));
131+ jPanelSkip.setBorder(javax.swing.BorderFactory.createTitledBorder("3.Input Filter"));
132132 jPanelSkip.setLayout(new java.awt.GridBagLayout());
133133
134134 jCheckBoxUseMessageFilter.setText("Use This Recipe");
@@ -214,4 +214,8 @@ public class MX10View extends javax.swing.JPanel {
214214 _jTableSkip.setModel(createSkipTableModel(_process._data));
215215 _jTableSkip.getColumnModel().getColumn(0).setMinWidth(150);
216216 }
217+
218+ public void refreshList() {
219+ _inPanel.refreshList();
220+ }
217221 }
--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx60output/MX60MidiOutListPanel.java
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx60output/MX60MidiOutListPanel.java
@@ -199,7 +199,7 @@ public class MX60MidiOutListPanel extends javax.swing.JPanel {
199199 JMenuItem item = (JMenuItem)arg0.getSource();
200200 String itemText = item.getText();
201201 int newAssign;
202- if (itemText.startsWith("(")) {
202+ if (itemText.startsWith("(none")) {
203203 newAssign = -1;
204204 }else {
205205 newAssign = MXUtilMidi.valueOfPortName(itemText);
--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx60output/MX60View.form
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx60output/MX60View.form
@@ -40,7 +40,7 @@
4040 <Properties>
4141 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
4242 <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
43- <TitledBorder title="1.Assign Output"/>
43+ <TitledBorder title="3.Output Assign"/>
4444 </Border>
4545 </Property>
4646 </Properties>
@@ -56,7 +56,7 @@
5656 <Properties>
5757 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
5858 <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
59- <TitledBorder title="2. Port Forwarding"/>
59+ <TitledBorder title="1. Output Forwarding"/>
6060 </Border>
6161 </Property>
6262 </Properties>
@@ -74,7 +74,7 @@
7474 <Properties>
7575 <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
7676 <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
77- <TitledBorder title="3.Skip Which"/>
77+ <TitledBorder title="2.Output Filter"/>
7878 </Border>
7979 </Property>
8080 </Properties>
--- a/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx60output/MX60View.java
+++ b/mixrecipe/src/2023-03-17 VST ver/mixrecipe/src/jp/synthtarou/midimixer/mx60output/MX60View.java
@@ -39,6 +39,7 @@ public class MX60View extends javax.swing.JPanel {
3939 JTableWithColumnHeader _jTableSkip;
4040 boolean _useSkipCC = true;
4141 MXWrapList<Integer> _recPortList;
42+ MX60MidiOutListPanel _midiPanel;
4243
4344 /**
4445 * Creates new form MX50
@@ -47,7 +48,8 @@ public class MX60View extends javax.swing.JPanel {
4748 _process = process;
4849 initComponents();
4950
50- jPanelOutputSelect.add(new MX60MidiOutListPanel());
51+ _midiPanel = new MX60MidiOutListPanel();
52+ jPanelOutputSelect.add(_midiPanel);
5153
5254 //_recPortList = MXUtilMidi.createPort(false);
5355 //jComboBoxRecSong.setModel(_recPortList);
@@ -99,17 +101,17 @@ public class MX60View extends javax.swing.JPanel {
99101
100102 jSplitPane1.setDividerLocation(300);
101103
102- jPanelOutputSelect.setBorder(javax.swing.BorderFactory.createTitledBorder("1.Assign Output"));
104+ jPanelOutputSelect.setBorder(javax.swing.BorderFactory.createTitledBorder("3.Output Assign"));
103105 jPanelOutputSelect.setLayout(new javax.swing.BoxLayout(jPanelOutputSelect, javax.swing.BoxLayout.LINE_AXIS));
104106 jSplitPane1.setLeftComponent(jPanelOutputSelect);
105107
106- jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("2. Port Forwarding"));
108+ jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("1. Output Forwarding"));
107109 jPanel2.setLayout(new javax.swing.BoxLayout(jPanel2, javax.swing.BoxLayout.LINE_AXIS));
108110 jSplitPane1.setBottomComponent(jPanel2);
109111
110112 jSplitPane2.setTopComponent(jSplitPane1);
111113
112- jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("3.Skip Which"));
114+ jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("2.Output Filter"));
113115 jPanel3.setLayout(new java.awt.GridBagLayout());
114116 gridBagConstraints = new java.awt.GridBagConstraints();
115117 gridBagConstraints.gridx = 0;
@@ -207,4 +209,8 @@ public class MX60View extends javax.swing.JPanel {
207209 _jTableSkip.setModel(createSkipTableModel());
208210 _jTableSkip.getColumnModel().getColumn(0).setMinWidth(150);
209211 }
212+
213+ public void refreshList() {
214+ _midiPanel.refreshList();
215+ }
210216 }
Show on old repository browser