Changeset 366 for trunk/src_apollo/org/apollo/io/MixIO.java

Timestamp:

10/11/08 15:15:17 (16 years ago)

Author:

bjn8

Message:

Improved mix settings... Also fix widget anchoring bug in Apollo

File:

• trunk/src_apollo/org/apollo/io/MixIO.java (modified) (6 diffs)

trunk/src_apollo/org/apollo/io/MixIO.java

@@ -130 +130 @@
          *              The mixes to write to file
          * 
-         * @param usingLocalFlags
-         *              Parallel list with banks. The isUsingLocal flag...
-         */
-        public static void saveBanks(String mixBatchPath, List<TrackMixSubject> banks, List<Boolean> usingLocalFlags) {
+         */
+        public static void saveBanks(String mixBatchPath, List<TrackMixSubject> banks) {
                 
                 assert(mixBatchPath != null);
                 assert(banks != null);
-                assert(usingLocalFlags != null);
-                assert(usingLocalFlags.size() == banks.size());
                 
                 File mixFile = new File(mixBatchPath);
@@ -161 +157 @@
                                 TrackMixSubject mix = banks.get(i);
                                 assert(mix != null);
-                                
-                                Boolean flag = usingLocalFlags.get(i);
-                                assert(flag != null);
-                                
                                 out.write(mix.toParseableString() + "\n");
-                                out.write(flag.booleanValue() ? "1\n" : "0\n");
                         }
 
@@ -193 +184 @@
          *              A list to load the banks into. Must not be null - must be empty.
          * 
-         * @param usingLocalFlags
-         *              A list to load the channel flags into... Must not be null - must be empty.
-         * 
          * @return
          *              True of success. False if IO operatoin failed / file does not exist. 
@@ -201 +189 @@
         public static boolean loadBanks(
                         List<TrackMixSubject> banks,
-                        List<Boolean> usingLocalFlags,
                         String banksFilepath) {
                 
                 assert(banks != null);
-                assert(usingLocalFlags != null);
                 assert(banksFilepath != null);
                 assert(banks.isEmpty());
-                assert(usingLocalFlags.isEmpty());
                 
                 File mixFile = new File(banksFilepath);
@@ -230 +215 @@
                         String line = null;
                         // Read the sbase file...
-                        boolean waitingOnFlag = false;
                         while ((line = in.readLine()) != null) {
                                 
@@ -237 +221 @@
                                 
                                 TrackMixSubject mix = TrackMixSubject.fromString(line);
-                                
-                                if (mix != null) {
-                                        
-                                        if (waitingOnFlag) { // missing flag for last mix line
-                                                usingLocalFlags.add(new Boolean(false)); // default to false
-                                        }
-                                        
+                        
+                                if (mix != null) 
                                         banks.add(mix);
-                                        waitingOnFlag = true;
-                                        
-                                } else if (waitingOnFlag) { // waiting on flag?
-                                        
-                                        if (line.equals("1")) {
-                                                usingLocalFlags.add(new Boolean(true));
-                                                waitingOnFlag = false;
-                                        } else if (line.equals("0")) {
-                                                usingLocalFlags.add(new Boolean(false));
-                                                waitingOnFlag = false;
-                                        }
-                                }
-                                
-                                
-                        }
-                        
-                        if (usingLocalFlags.size() == (banks.size() - 1)) { // missing last flag
-                                usingLocalFlags.add(new Boolean(false));
-                        }
-                        
-                        assert(usingLocalFlags.size() == banks.size());
-                        
+        
+                        }
+
                 } catch (Exception e) {
                         e.printStackTrace();