1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
Index: libtritonus-java-20070428/src/classes/org/tritonus/midi/device/java/JavaSequencer.java
===================================================================
--- libtritonus-java-20070428.orig/src/classes/org/tritonus/midi/device/java/JavaSequencer.java 2007-04-30 18:45:40.000000000 +0200
+++ libtritonus-java-20070428/src/classes/org/tritonus/midi/device/java/JavaSequencer.java 2007-04-30 18:46:12.000000000 +0200
@@ -99,15 +99,7 @@
Arrays.asList(MASTER_SYNC_MODES),
Arrays.asList(SLAVE_SYNC_MODES));
if (TDebug.TraceSequencer) { TDebug.out("JavaSequencer.<init>(): begin"); }
- String strVersion = System.getProperty("java.version");
- if (strVersion.indexOf("1.4.2") != -1)
- {
- setClock(new SunMiscPerfClock());
- }
- else
- {
- setClock(new SystemCurrentTimeMillisClock());
- }
+ setClock(new SystemCurrentTimeMillisClock());
String strOS = System.getProperty("os.name");
if (strOS.equals("Linux"))
{
Index: libtritonus-java-20070428/src/classes/org/tritonus/midi/device/java/SunMiscPerfClock.java
===================================================================
--- libtritonus-java-20070428.orig/src/classes/org/tritonus/midi/device/java/SunMiscPerfClock.java 2007-04-30 18:46:17.000000000 +0200
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- * SunMiscPerfClock.java
- *
- * This file is part of Tritonus: http://www.tritonus.org/
- */
-
-/*
- * Copyright (c) 2003 by Matthias Pfisterer
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published
- * by the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
-|<--- this code is formatted to fit into 80 columns --->|
-*/
-
-package org.tritonus.midi.device.java;
-
-import sun.misc.Perf;
-
-
-/** Sequencer clock based on sun.misc.Perf.
- Sun JDK 1.4.2 or later is required to compile this class.
- */
-public class SunMiscPerfClock
-implements JavaSequencer.Clock
-{
- private Perf m_perf;
- private long m_lTicksPerSecond;
-
-
- public SunMiscPerfClock()
- {
- m_perf = Perf.getPerf(); // may throw SecurityException
- m_lTicksPerSecond = m_perf.highResFrequency();
- }
-
-
- /** Retrieve system time in microseconds.
- This method retrieves the time by calling
- {@link sun.misc.Perf}.
-
- @return the system time in microseconds
- */
- public long getMicroseconds()
- {
- return (m_perf.highResCounter() * 1000000) / m_lTicksPerSecond;
- }
-}
-
-
-
-/*** SunMiscPerfClock.java ***/
|
