[pLog-svn] r7237 - plog/branches/lifetype-1.2/class/gallery/getid3

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2020-07-15 03:59:13 -0400 (Wed, 15 Jul 2020)
New Revision: 7237

Modified:
   plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php
Log:
merging in -r3672, though using is_array for the whole block seems better than just checking for ksort?

Modified: plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php
===================================================================
--- plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php	2020-07-15 07:52:53 UTC (rev 7236)
+++ plog/branches/lifetype-1.2/class/gallery/getid3/module.audio.midi.php	2020-07-15 07:59:13 UTC (rev 7237)
@@ -296,27 +296,29 @@
 			}
 			$previoustickoffset      = null;
 			$prevmicrosecondsperbeat = null;
-
-			ksort($MicroSecondsPerQuarterNoteAfter);
-			foreach ($MicroSecondsPerQuarterNoteAfter as $tickoffset => $microsecondsperbeat) {
-				if (is_null($previoustickoffset)) {
-					$prevmicrosecondsperbeat = $microsecondsperbeat;
-					$previoustickoffset = $tickoffset;
-					continue;
-				}
-				if ($thisfile_midi['totalticks'] > $tickoffset) {
-
-					if ($thisfile_midi_raw['ticksperqnote'] == 0) {
-						$this->error('Corrupt MIDI file: ticksperqnote == zero');
-						return false;
-					}
-
-					$info['playtime_seconds'] += (($tickoffset - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($prevmicrosecondsperbeat / 1000000);
-
-					$prevmicrosecondsperbeat = $microsecondsperbeat;
-					$previoustickoffset = $tickoffset;
-				}
-			}
+            
+            if (!is_array($MicroSecondsPerQuarterNoteAfter)){
+                ksort($MicroSecondsPerQuarterNoteAfter);
+                foreach ($MicroSecondsPerQuarterNoteAfter as $tickoffset => $microsecondsperbeat) {
+                    if (is_null($previoustickoffset)) {
+                        $prevmicrosecondsperbeat = $microsecondsperbeat;
+                        $previoustickoffset = $tickoffset;
+                        continue;
+                    }
+                    if ($thisfile_midi['totalticks'] > $tickoffset) {
+                        
+                        if ($thisfile_midi_raw['ticksperqnote'] == 0) {
+                            $this->error('Corrupt MIDI file: ticksperqnote == zero');
+                            return false;
+                        }
+                        
+                        $info['playtime_seconds'] += (($tickoffset - $previoustickoffset) / $thisfile_midi_raw['ticksperqnote']) * ($prevmicrosecondsperbeat / 1000000);
+                        
+                        $prevmicrosecondsperbeat = $microsecondsperbeat;
+                        $previoustickoffset = $tickoffset;
+                    }
+                }
+            }
 			if ($thisfile_midi['totalticks'] > $previoustickoffset) {
 
 				if ($thisfile_midi_raw['ticksperqnote'] == 0) {