You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(2) |
Nov
|
Dec
|
|
From: <yu...@us...> - 2024-09-07 22:31:34
|
Revision: 2786
http://sourceforge.net/p/swingme/code/2786
Author: yuranet
Date: 2024-09-07 22:31:32 +0000 (Sat, 07 Sep 2024)
Log Message:
-----------
fix for ios not running in AS
Modified Paths:
--------------
SwingMETest/android/build.gradle
SwingMETest/build.gradle
SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj
quickstart/android/build.gradle
quickstart/build.gradle
quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj
Modified: SwingMETest/android/build.gradle
===================================================================
--- SwingMETest/android/build.gradle 2024-09-07 14:21:32 UTC (rev 2785)
+++ SwingMETest/android/build.gradle 2024-09-07 22:31:32 UTC (rev 2786)
@@ -1,3 +1,16 @@
+buildscript {
+ repositories {
+ mavenCentral()
+ google()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.3.3'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
apply plugin: 'com.android.application'
android {
Modified: SwingMETest/build.gradle
===================================================================
--- SwingMETest/build.gradle 2024-09-07 14:21:32 UTC (rev 2785)
+++ SwingMETest/build.gradle 2024-09-07 22:31:32 UTC (rev 2786)
@@ -1,19 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- google()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:3.3.3'
-
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
- }
-}
-
allprojects {
repositories {
mavenCentral()
Modified: SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj 2024-09-07 14:21:32 UTC (rev 2785)
+++ SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj 2024-09-07 22:31:32 UTC (rev 2786)
@@ -427,8 +427,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEAD_CODE_STRIPPING = NO;
ENABLE_BITCODE = NO;
- EXCLUDED_ARCHS = "";
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${MOE_FRAMEWORK_PATH}",
@@ -466,8 +464,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEAD_CODE_STRIPPING = NO;
ENABLE_BITCODE = NO;
- EXCLUDED_ARCHS = "";
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${MOE_FRAMEWORK_PATH}",
Modified: quickstart/android/build.gradle
===================================================================
--- quickstart/android/build.gradle 2024-09-07 14:21:32 UTC (rev 2785)
+++ quickstart/android/build.gradle 2024-09-07 22:31:32 UTC (rev 2786)
@@ -1,3 +1,16 @@
+buildscript {
+ repositories {
+ mavenCentral()
+ google()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:3.3.3'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
apply plugin: 'com.android.application'
android {
Modified: quickstart/build.gradle
===================================================================
--- quickstart/build.gradle 2024-09-07 14:21:32 UTC (rev 2785)
+++ quickstart/build.gradle 2024-09-07 22:31:32 UTC (rev 2786)
@@ -1,18 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
- repositories {
- mavenCentral()
- google()
- }
- dependencies {
- classpath 'com.android.tools.build:gradle:3.3.3'
-
- // NOTE: Do not place your application dependencies here; they belong
- // in the individual module build.gradle files
- }
-}
-
allprojects {
repositories {
mavenCentral()
Modified: quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj
===================================================================
--- quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj 2024-09-07 14:21:32 UTC (rev 2785)
+++ quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj 2024-09-07 22:31:32 UTC (rev 2786)
@@ -427,8 +427,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEAD_CODE_STRIPPING = NO;
ENABLE_BITCODE = NO;
- EXCLUDED_ARCHS = "";
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${MOE_FRAMEWORK_PATH}",
@@ -466,8 +464,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEAD_CODE_STRIPPING = NO;
ENABLE_BITCODE = NO;
- EXCLUDED_ARCHS = "";
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${MOE_FRAMEWORK_PATH}",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-07 14:21:36
|
Revision: 2785
http://sourceforge.net/p/swingme/code/2785
Author: yuranet
Date: 2024-09-07 14:21:32 +0000 (Sat, 07 Sep 2024)
Log Message:
-----------
use cross platform L\&F
Modified Paths:
--------------
quickstart/src/hello/world/HelloWorld.java
Modified: quickstart/src/hello/world/HelloWorld.java
===================================================================
--- quickstart/src/hello/world/HelloWorld.java 2024-09-07 14:20:42 UTC (rev 2784)
+++ quickstart/src/hello/world/HelloWorld.java 2024-09-07 14:21:32 UTC (rev 2785)
@@ -8,7 +8,6 @@
import net.yura.mobile.gui.components.Label;
import net.yura.mobile.gui.components.Panel;
import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.gui.plaf.nimbus.NimbusLookAndFeel;
import javax.microedition.lcdui.Graphics;
/**
@@ -18,7 +17,7 @@
protected void initialize(DesktopPane dp) {
- dp.setLookAndFeel(new NimbusLookAndFeel());
+ dp.setLookAndFeel(DesktopPane.getSystemLookAndFeelClassName());
Frame frame = new Frame("SwingME app");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-07 14:20:44
|
Revision: 2784
http://sourceforge.net/p/swingme/code/2784
Author: yuranet
Date: 2024-09-07 14:20:42 +0000 (Sat, 07 Sep 2024)
Log Message:
-----------
added getSystemLookAndFeelClassName method
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2024-09-07 14:01:45 UTC (rev 2783)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2024-09-07 14:20:42 UTC (rev 2784)
@@ -40,6 +40,7 @@
import net.yura.mobile.gui.layout.XULLoader;
import net.yura.mobile.gui.plaf.LookAndFeel;
import net.yura.mobile.gui.plaf.Style;
+import net.yura.mobile.gui.plaf.nimbus.NimbusLookAndFeel;
import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.SystemUtil;
@@ -360,6 +361,30 @@
}
/**
+ * @see javax.swing.UIManager#getSystemLookAndFeelClassName()
+ */
+ public static LookAndFeel getSystemLookAndFeelClassName() {
+ if (Application.getPlatform() == Application.PLATFORM_IOS) {
+ try {
+ return (LookAndFeel) Class.forName("net.yura.ios.plaf.IOSLookAndFeel").newInstance();
+ }
+ catch (Exception e) {
+ Logger.warn("unable to get ios L&F class", e);
+ }
+ }
+ else if (Application.getPlatform() == Application.PLATFORM_ANDROID) {
+ try {
+ return (LookAndFeel) Class.forName("net.yura.android.plaf.AndroidLookAndFeel").newInstance();
+ }
+ catch (Exception e) {
+ Logger.warn("unable to get android L&F class", e);
+ }
+ }
+
+ return new NimbusLookAndFeel();
+ }
+
+ /**
* sets the default theme, and sets up default values if there are none set
* @param a The Theme
* @see javax.swing.UIManager#setLookAndFeel(javax.swing.LookAndFeel) UIManager.setLookAndFeel
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-07 14:01:50
|
Revision: 2783
http://sourceforge.net/p/swingme/code/2783
Author: yuranet
Date: 2024-09-07 14:01:45 +0000 (Sat, 07 Sep 2024)
Log Message:
-----------
use meta-data to load info for android
Modified Paths:
--------------
quickstart/android/AndroidManifest.xml
quickstart/ios/xcode/Quickstart/Assets.xcassets/AppIcon.appiconset/Contents.json
quickstart/ios/xcode/Quickstart/Assets.xcassets/AppIcon.appiconset/Ic...@2x...g
quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj
Removed Paths:
-------------
quickstart/android/assets/quickstart.jad
Modified: quickstart/android/AndroidManifest.xml
===================================================================
--- quickstart/android/AndroidManifest.xml 2024-09-07 13:59:22 UTC (rev 2782)
+++ quickstart/android/AndroidManifest.xml 2024-09-07 14:01:45 UTC (rev 2783)
@@ -25,5 +25,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <meta-data android:name="SwingME.Main.Class" android:value="hello.world.HelloWorld"/>
</application>
</manifest>
Deleted: quickstart/android/assets/quickstart.jad
===================================================================
--- quickstart/android/assets/quickstart.jad 2024-09-07 13:59:22 UTC (rev 2782)
+++ quickstart/android/assets/quickstart.jad 2024-09-07 14:01:45 UTC (rev 2783)
@@ -1 +0,0 @@
-MIDlet-1: HelloWorld,,hello.world.HelloWorld
Modified: quickstart/ios/xcode/Quickstart/Assets.xcassets/AppIcon.appiconset/Contents.json
===================================================================
--- quickstart/ios/xcode/Quickstart/Assets.xcassets/AppIcon.appiconset/Contents.json 2024-09-07 13:59:22 UTC (rev 2782)
+++ quickstart/ios/xcode/Quickstart/Assets.xcassets/AppIcon.appiconset/Contents.json 2024-09-07 14:01:45 UTC (rev 2783)
@@ -1,44 +1,59 @@
{
"images" : [
{
- "size" : "29x29",
"idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "20x20"
+ },
+ {
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "20x20"
+ },
+ {
"filename" : "Ic...@2x...g",
- "scale" : "2x"
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "size" : "29x29",
+ "filename" : "Ic...@3x...g",
"idiom" : "iphone",
- "filename" : "Ic...@3x...g",
- "scale" : "3x"
+ "scale" : "3x",
+ "size" : "29x29"
},
{
- "size" : "40x40",
+ "filename" : "Ic...@2x...g",
"idiom" : "iphone",
- "filename" : "Ic...@2x...g",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "40x40"
},
{
- "size" : "40x40",
+ "filename" : "Ic...@3x...g",
"idiom" : "iphone",
- "filename" : "Ic...@3x...g",
- "scale" : "3x"
+ "scale" : "3x",
+ "size" : "40x40"
},
{
- "size" : "60x60",
+ "filename" : "Ic...@2x...g",
"idiom" : "iphone",
- "filename" : "Ic...@2x...g",
- "scale" : "2x"
+ "scale" : "2x",
+ "size" : "60x60"
},
{
- "size" : "60x60",
+ "filename" : "Ic...@3x...g",
"idiom" : "iphone",
- "filename" : "Ic...@3x...g",
- "scale" : "3x"
+ "scale" : "3x",
+ "size" : "60x60"
+ },
+ {
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
}
],
"info" : {
- "version" : 1,
- "author" : "xcode"
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
Modified: quickstart/ios/xcode/Quickstart/Assets.xcassets/AppIcon.appiconset/Ic...@2x...g
===================================================================
(Binary files differ)
Modified: quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj
===================================================================
--- quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj 2024-09-07 13:59:22 UTC (rev 2782)
+++ quickstart/ios/xcode/Quickstart.xcodeproj/project.pbxproj 2024-09-07 14:01:45 UTC (rev 2783)
@@ -306,6 +306,7 @@
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
+ "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${MOE_FRAMEWORK_PATH}",
@@ -326,7 +327,6 @@
SYMROOT = "$(SRCROOT)/../build/moe/xcodebuild/sym";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
};
name = Release;
};
@@ -353,6 +353,7 @@
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
+ "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${MOE_FRAMEWORK_PATH}",
@@ -380,7 +381,6 @@
SDKROOT = iphoneos;
SYMROOT = "$(SRCROOT)/../build/moe/xcodebuild/sym";
TARGETED_DEVICE_FAMILY = "1,2";
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
};
name = Debug;
};
@@ -414,7 +414,7 @@
"${MOE_OTHER_LDFLAGS}",
"$(inherited)",
);
- PRODUCT_BUNDLE_IDENTIFIER = org.moe.samples.Quickstart;
+ PRODUCT_BUNDLE_IDENTIFIER = swingme.quickstart.test;
PRODUCT_NAME = "Quickstart-Test";
STRIP_STYLE = "non-global";
};
@@ -453,7 +453,7 @@
"${MOE_OTHER_LDFLAGS}",
"$(inherited)",
);
- PRODUCT_BUNDLE_IDENTIFIER = net.yura.swingme.Quickstart;
+ PRODUCT_BUNDLE_IDENTIFIER = swingme.quickstart;
PRODUCT_NAME = Quickstart;
STRIP_STYLE = "non-global";
};
@@ -492,7 +492,7 @@
"${MOE_OTHER_LDFLAGS}",
"$(inherited)",
);
- PRODUCT_BUNDLE_IDENTIFIER = net.yura.swingme.Quickstart;
+ PRODUCT_BUNDLE_IDENTIFIER = swingme.quickstart;
PRODUCT_NAME = Quickstart;
STRIP_STYLE = "non-global";
};
@@ -528,7 +528,7 @@
"${MOE_OTHER_LDFLAGS}",
"$(inherited)",
);
- PRODUCT_BUNDLE_IDENTIFIER = org.moe.samples.Quickstart;
+ PRODUCT_BUNDLE_IDENTIFIER = swingme.quickstart.test;
PRODUCT_NAME = "Quickstart-Test";
STRIP_STYLE = "non-global";
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-07 13:59:24
|
Revision: 2782
http://sourceforge.net/p/swingme/code/2782
Author: yuranet
Date: 2024-09-07 13:59:22 +0000 (Sat, 07 Sep 2024)
Log Message:
-----------
allow app name to come from meta-data
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-09-07 12:10:30 UTC (rev 2781)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-09-07 13:59:22 UTC (rev 2782)
@@ -1,7 +1,6 @@
package net.yura.android;
-import java.util.Vector;
-
+import java.util.List;
import javax.microedition.lcdui.Canvas;
import javax.microedition.lcdui.Display;
import javax.microedition.lcdui.Displayable;
@@ -57,7 +56,7 @@
protected void onSingleCreate() {
showWaitingView();
- Vector<String[]> jadMidlets = AndroidMeApp.getJadMidlets();
+ List<String[]> jadMidlets = AndroidMeApp.getJadMidlets();
if (jadMidlets.size() == 1) {
startMIDlet();
@@ -68,7 +67,7 @@
String[] listValues = new String[jadMidlets.size()];
for (int i = 0; i < jadMidlets.size(); i++) {
- listValues[i] = jadMidlets.elementAt(i)[0];
+ listValues[i] = jadMidlets.get(i)[0];
}
listView.setAdapter(new ArrayAdapter<String>(AndroidMeActivity.this, android.R.layout.simple_list_item_1, listValues));
@@ -352,8 +351,8 @@
//Override
public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
if (position >= 0) {
- Vector<String[]> jadMidlets = AndroidMeApp.getJadMidlets();
- String midletClassName = jadMidlets.elementAt(position)[2];
+ List<String[]> jadMidlets = AndroidMeApp.getJadMidlets();
+ String midletClassName = jadMidlets.get(position)[2];
startMIDlet(midletClassName);
}
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-09-07 12:10:30 UTC (rev 2781)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-09-07 13:59:22 UTC (rev 2782)
@@ -23,6 +23,7 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
@@ -66,12 +67,12 @@
}
}
- public static Vector<String[]> getJadMidlets() {
+ public static List<String[]> getJadMidlets() {
return instance.jadMidlets;
}
private MIDlet midlet;
- private Vector<String[]> jadMidlets;
+ private List<String[]> jadMidlets;
private Thread eventThread;
private final Object lock = new Object();
private Handler handler;
@@ -97,9 +98,9 @@
setSystemProperties();
loadJadFile();
- Vector<String[]> jadMidlets = getJadMidlets();
+ List<String[]> jadMidlets = getJadMidlets();
if (jadMidlets.size() == 1) {
- String midletClassName = jadMidlets.elementAt(0)[2];
+ String midletClassName = jadMidlets.get(0)[2];
createMIDlet(midletClassName);
}
}
@@ -500,6 +501,20 @@
Properties properties = new Properties();
MIDlet.DEFAULT_APPLICATION_PROPERTIES = properties;
+ try {
+ ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
+ String mainClass = ai.metaData.getString("SwingME.Main.Class");
+ if (mainClass != null) {
+ jadMidlets = Collections.singletonList(new String[] {null, null, mainClass});
+ for (String key : ai.metaData.keySet()) {
+ properties.put(key, ai.metaData.get(key));
+ }
+ return;
+ }
+ } catch (Exception e) {
+ // carry on to other methods
+ }
+
String[] assetList = getResources().getAssets().list("");
for (int i = 0; i < assetList.length; i++) {
//System.out.println("> > >" + assetList[i]);
@@ -534,7 +549,7 @@
String[] midletEntry = {midletName, iconName, className};
jadMidlets.add(midletEntry);
} catch (Throwable e) {
- Logger.warn(null, e);
+ Logger.warn("unable to decode: " + midletProp, e);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-01 10:33:57
|
Revision: 2780
http://sourceforge.net/p/swingme/code/2780
Author: yuranet
Date: 2024-09-01 10:33:55 +0000 (Sun, 01 Sep 2024)
Log Message:
-----------
do not play sound if music is playing
Modified Paths:
--------------
iOSME/src/javax/microedition/media/AudioPlayer.java
Modified: iOSME/src/javax/microedition/media/AudioPlayer.java
===================================================================
--- iOSME/src/javax/microedition/media/AudioPlayer.java 2024-08-31 15:45:28 UTC (rev 2779)
+++ iOSME/src/javax/microedition/media/AudioPlayer.java 2024-09-01 10:33:55 UTC (rev 2780)
@@ -6,6 +6,7 @@
import java.io.IOException;
import java.io.InputStream;
import apple.avfaudio.AVAudioPlayer;
+import apple.avfaudio.AVAudioSession;
import apple.foundation.NSData;
import apple.foundation.NSError;
import apple.foundation.NSURL;
@@ -14,6 +15,8 @@
class AudioPlayer implements Player {
+ private static final AVAudioSession audioSession = AVAudioSession.sharedInstance();
+
//AVPlayer player works equally well with local and remote media files
//AVAudioPlayer Apple recommends that you use this class for audio playback unless you are playing audio captured from a network stream
AVAudioPlayer player;
@@ -128,6 +131,13 @@
@Override
public void start() throws MediaException {
+
+ //boolean isOtherAudioPlaying = AVAudioSession.sharedInstance().isOtherAudioPlaying();
+ // if user is watching video or playing music, then do not play sound
+ if (audioSession.secondaryAudioShouldBeSilencedHint()) {
+ return;
+ }
+
boolean success = player.play();
if (!success) {
System.out.println("unable to start playback! " + this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-08-31 15:45:33
|
Revision: 2779
http://sourceforge.net/p/swingme/code/2779
Author: yuranet
Date: 2024-08-31 15:45:28 +0000 (Sat, 31 Aug 2024)
Log Message:
-----------
fix to install on new android versions
Modified Paths:
--------------
SwingMETest/android/AndroidManifest.xml
Modified: SwingMETest/android/AndroidManifest.xml
===================================================================
--- SwingMETest/android/AndroidManifest.xml 2024-08-19 19:16:22 UTC (rev 2778)
+++ SwingMETest/android/AndroidManifest.xml 2024-08-31 15:45:28 UTC (rev 2779)
@@ -4,7 +4,7 @@
android:versionCode="1"
android:versionName="1.0">
- <uses-sdk android:targetSdkVersion="30" />
+ <uses-sdk android:targetSdkVersion="34" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
@@ -38,7 +38,8 @@
android:launchMode="singleTask"
android:label="@string/app_name"
android:windowSoftInputMode="adjustResize|stateHidden"
- android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize">
+ android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-08-19 19:16:39
|
Revision: 2778
http://sourceforge.net/p/swingme/code/2778
Author: yuranet
Date: 2024-08-19 19:16:22 +0000 (Mon, 19 Aug 2024)
Log Message:
-----------
check return value
Modified Paths:
--------------
iOSME/src/javax/microedition/media/AudioPlayer.java
Modified: iOSME/src/javax/microedition/media/AudioPlayer.java
===================================================================
--- iOSME/src/javax/microedition/media/AudioPlayer.java 2024-05-08 16:57:53 UTC (rev 2777)
+++ iOSME/src/javax/microedition/media/AudioPlayer.java 2024-08-19 19:16:22 UTC (rev 2778)
@@ -128,7 +128,10 @@
@Override
public void start() throws MediaException {
- player.play();
+ boolean success = player.play();
+ if (!success) {
+ System.out.println("unable to start playback! " + this);
+ }
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-05-08 16:57:56
|
Revision: 2777
http://sourceforge.net/p/swingme/code/2777
Author: yuranet
Date: 2024-05-08 16:57:53 +0000 (Wed, 08 May 2024)
Log Message:
-----------
fix for sound on linux
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-05-08 10:50:01 UTC (rev 2776)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-05-08 16:57:53 UTC (rev 2777)
@@ -20,7 +20,8 @@
public class WavePlayerImpl extends BasicMMPlayer implements LineListener {
private static final Logger LOGGER = Logger.getLogger(WavePlayerImpl.class.getName());
-
+
+ private static boolean useDefaultMixer;
private static final Set clipTooLong = new HashSet();
public WavePlayerImpl() {
@@ -64,7 +65,7 @@
LOGGER.fine("Start called for clip: "+clip);
String filename = dataSource.getLocator();
- if(clip == null){
+ if (clip == null) {
getAudioInputStream();
if (AudioSystem.isLineSupported(info)) {
@@ -71,7 +72,14 @@
clip = (Clip) AudioSystem.getLine(info);
}
else {
- clip = AudioSystem.getClip();
+ clip = useDefaultMixer ? AudioSystem.getClip(null) : AudioSystem.getClip();
+ // on Linux java 1.8 PulseAudioClip is nasty and does not work,
+ // does not allow loading audiostream with unknown length,
+ // and has deadlocks when playing more then one song at the same time
+ if (!useDefaultMixer && "org.classpath.icedtea.pulseaudio.PulseAudioClip".equals(clip.getClass().getName())) {
+ useDefaultMixer = true;
+ clip = AudioSystem.getClip(null);
+ }
}
if (AudioSystem.isLineSupported(new DataLine.Info(SourceDataLine.class, audioInputStream.getFormat(), AudioSystem.NOT_SPECIFIED))) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-05-08 10:50:04
|
Revision: 2776
http://sourceforge.net/p/swingme/code/2776
Author: yuranet
Date: 2024-05-08 10:50:01 +0000 (Wed, 08 May 2024)
Log Message:
-----------
fix memory leak
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-05-06 15:37:31 UTC (rev 2775)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-05-08 10:50:01 UTC (rev 2776)
@@ -5,6 +5,7 @@
import java.util.Set;
import java.util.logging.Logger;
import javax.microedition.media.PlayerListener;
+import javax.microedition.midlet.ApplicationManager;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
@@ -159,6 +160,7 @@
if(state == STARTED){
state = PREFETCHED;
}
+ ApplicationManager.getInstance().activePlayers.removeElement(this);
notifyListeners(PlayerListener.STOPPED, null);
if(clip != null){
clip.close();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-05-06 15:37:33
|
Revision: 2775
http://sourceforge.net/p/swingme/code/2775
Author: yuranet
Date: 2024-05-06 15:37:31 +0000 (Mon, 06 May 2024)
Log Message:
-----------
use system prop
Modified Paths:
--------------
me4se/src/javax/microedition/media/Manager.java
Modified: me4se/src/javax/microedition/media/Manager.java
===================================================================
--- me4se/src/javax/microedition/media/Manager.java 2024-04-25 09:11:29 UTC (rev 2774)
+++ me4se/src/javax/microedition/media/Manager.java 2024-05-06 15:37:31 UTC (rev 2775)
@@ -142,7 +142,8 @@
if (locator.startsWith(Connector.PROTOCOL_ASSET)) {
String filePath = locator.substring( Connector.PROTOCOL_ASSET.length() );
- locator = new File(".").getCanonicalFile().toURI() + filePath;
+ // we use 'user.dir' as this allows the current dir to be updated by the app
+ locator = new File(System.getProperty("user.dir")).toURI() + filePath;
}
return createPlayer(new BasicMMDataSource(locator));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-04-25 09:11:32
|
Revision: 2774
http://sourceforge.net/p/swingme/code/2774
Author: yuranet
Date: 2024-04-25 09:11:29 +0000 (Thu, 25 Apr 2024)
Log Message:
-----------
close audio input if not needed
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-04-24 21:53:16 UTC (rev 2773)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-04-25 09:11:29 UTC (rev 2774)
@@ -84,11 +84,11 @@
AudioFormat af = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, rate, 16, ch, ch * 2, rate, false);
if (AudioSystem.isConversionSupported(af, audioFormat)) {
try {
- AudioInputStream output = AudioSystem.getAudioInputStream(af, audioInputStream);
+ audioInputStream = AudioSystem.getAudioInputStream(af, audioInputStream);
if (clipTooLong.contains(filename)) {
- output = new AudioInputStream(output, af, 1000000);
+ audioInputStream = new AudioInputStream(audioInputStream, af, 1000000);
}
- clip.open(output);
+ clip.open(audioInputStream);
}
catch (LineUnavailableException ex) {
LOGGER.info("CLIP TOO LONG, TRYING SHORTER CLIP " + filename + " " + ex);
@@ -97,12 +97,13 @@
}
// as we have already tried to play the audio stream, its messed up,
// so we need to reset it and try again
+ audioInputStream.close();
audioInputStream = null;
getAudioInputStream();
// make it shorter and try again
- AudioInputStream output = AudioSystem.getAudioInputStream(af, audioInputStream);
- output = new AudioInputStream(output, af, 1000000);
- clip.open(output);
+ audioInputStream = AudioSystem.getAudioInputStream(af, audioInputStream);
+ audioInputStream = new AudioInputStream(audioInputStream, af, 1000000);
+ clip.open(audioInputStream);
}
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-04-24 21:53:21
|
Revision: 2773
http://sourceforge.net/p/swingme/code/2773
Author: yuranet
Date: 2024-04-24 21:53:16 +0000 (Wed, 24 Apr 2024)
Log Message:
-----------
fixed final crash lol
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-04-24 21:32:00 UTC (rev 2772)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-04-24 21:53:16 UTC (rev 2773)
@@ -1,6 +1,8 @@
package org.me4se.psi.java1.media.audio;
import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
import java.util.logging.Logger;
import javax.microedition.media.PlayerListener;
import javax.sound.sampled.AudioFormat;
@@ -17,6 +19,8 @@
public class WavePlayerImpl extends BasicMMPlayer implements LineListener {
private static final Logger LOGGER = Logger.getLogger(WavePlayerImpl.class.getName());
+
+ private static final Set clipTooLong = new HashSet();
public WavePlayerImpl() {
super(false);
@@ -57,6 +61,7 @@
public void startImpl() throws Exception {
LOGGER.fine("Start called for clip: "+clip);
+ String filename = dataSource.getLocator();
if(clip == null){
getAudioInputStream();
@@ -79,9 +84,17 @@
AudioFormat af = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, rate, 16, ch, ch * 2, rate, false);
if (AudioSystem.isConversionSupported(af, audioFormat)) {
try {
- clip.open(AudioSystem.getAudioInputStream(af, audioInputStream));
+ AudioInputStream output = AudioSystem.getAudioInputStream(af, audioInputStream);
+ if (clipTooLong.contains(filename)) {
+ output = new AudioInputStream(output, af, 1000000);
+ }
+ clip.open(output);
}
catch (LineUnavailableException ex) {
+ LOGGER.info("CLIP TOO LONG, TRYING SHORTER CLIP " + filename + " " + ex);
+ if (filename != null) {
+ clipTooLong.add(filename);
+ }
// as we have already tried to play the audio stream, its messed up,
// so we need to reset it and try again
audioInputStream = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-04-24 21:32:02
|
Revision: 2772
http://sourceforge.net/p/swingme/code/2772
Author: yuranet
Date: 2024-04-24 21:32:00 +0000 (Wed, 24 Apr 2024)
Log Message:
-----------
finally got all audio working
Modified Paths:
--------------
me4se/build.xml
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Removed Paths:
-------------
me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
Modified: me4se/build.xml
===================================================================
--- me4se/build.xml 2024-04-23 17:32:43 UTC (rev 2771)
+++ me4se/build.xml 2024-04-24 21:32:00 UTC (rev 2772)
@@ -89,7 +89,7 @@
</patternset>
</unzip>
- <javac srcdir="src;opt/pim/src;opt/m3g/src;opt/contactless/src;opt/location/src;opt/bluetooth/src;opt/bluetooth/src_gcfimpl_avetanabt;opt/swingme/src" source="1.4" classpath="lib/emptycommapi.jar;opt/m3g/lib/jogl.jar;opt/contactless/lib/Phidget21.jar;opt/bluetooth/lib/avetanaBluetooth.jar;lib/Grasshopper.jar;opt/swingme/lib/SwingME.jar;lib/jlayer-1.0.1.4.jar" destdir="tmpclasses" debug="on" target="1.4" encoding="Cp1252">
+ <javac srcdir="src;opt/pim/src;opt/m3g/src;opt/contactless/src;opt/location/src;opt/bluetooth/src;opt/bluetooth/src_gcfimpl_avetanabt;opt/swingme/src" source="1.4" classpath="lib/emptycommapi.jar;opt/m3g/lib/jogl.jar;opt/contactless/lib/Phidget21.jar;opt/bluetooth/lib/avetanaBluetooth.jar;lib/Grasshopper.jar;opt/swingme/lib/SwingME.jar" destdir="tmpclasses" debug="on" target="1.4" encoding="Cp1252">
</javac>
Deleted: me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java 2024-04-23 17:32:43 UTC (rev 2771)
+++ me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java 2024-04-24 21:32:00 UTC (rev 2772)
@@ -1,125 +0,0 @@
-package org.me4se.psi.java1.media.audio;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.microedition.media.PlayerListener;
-import javazoom.jl.player.advanced.AdvancedPlayer;
-import javazoom.jl.player.advanced.PlaybackListener;
-import org.me4se.impl.BasicMMPlayer;
-
-/**
- * This class is only needed for playing LARGE mp3 files on java 1.5
- * all other versions of java are able to play mp3 files directly with WavePlayerImpl
- * @see WavePlayerImpl
- */
-public class JLayerPlayerImpl extends BasicMMPlayer {
-
- private static Logger logger = Logger.getLogger(JLayerPlayerImpl.class.getName());
-
- private static ExecutorService executorService = Executors.newSingleThreadExecutor();
-
- private final AtomicReference player = new AtomicReference();
-
- public JLayerPlayerImpl() {
- super(false);
- }
-
- public void realizeImpl() throws Exception {
- // System.out.println("BasicMMPlayer.realizeImpl()");
- }
-
- public void prefetchImpl() throws Exception {
-// logger.info("prefetchImpl " + this);
- }
-
- public void startImpl() throws Exception {
- player.set(new Player());
- }
-
- public void stopImpl() throws Exception {
- ((Player)player.get()).stop();
- }
-
- public void deallocateImpl() {
- // System.out.println("BasicMMPlayer.deallocateImpl()");
- }
-
- public void closeImpl() {
- // stop already calls close
- //player.close();
- }
-
- private class Player extends PlaybackListener implements Runnable {
-
- private volatile AdvancedPlayer currentJLayerPlayer;
-
- public Player() {
- new Thread(this, "JLayerPlayer-" + String.valueOf(dataSource)).start();
- }
-
- public void stop() {
- //playThread.interrupt(); // this does not work
- player.compareAndSet(this, null);
- final AdvancedPlayer player = currentJLayerPlayer;
- if (player != null) {
- // we need to only do close from own thread as
- // there are many locks in the sound framework
- // and we dont want to lock the AWT Event thread
- executorService.submit(new Runnable() {
- public void run() {
- player.close(); // stop() is the same as close, but also fires PlaybackListener
- }
- });
- }
- }
-
- public boolean isRunning() {
- return player.get() == this;
- }
-
- public void run() {
- startListenerNotification(PlayerListener.STARTED, null);
- try {
- for (int c = 0; c != loopCount && isRunning(); c++) {
-
- // player = new Player(fis);
- currentJLayerPlayer = new AdvancedPlayer(getInputStream());
- //currentJLayerPlayer.setPlayBackListener(this);
-
- if (!isRunning()) {
- currentJLayerPlayer.close();
- currentJLayerPlayer = null;
- break;
- }
-
- currentJLayerPlayer.play(); // thread goes into player
- currentJLayerPlayer = null;
- }
- }
- catch (Exception ex) {
- logger.log(Level.WARNING, "Error in " + Thread.currentThread(), ex);
- }
- player.compareAndSet(this, null);
- startListenerNotification(PlayerListener.STOPPED, null);
- }
-
- private InputStream getInputStream() {
- try {
- String url = dataSource.getLocator();
- if (url != null) {
- return new BufferedInputStream(new URL(url).openStream());
- }
- }
- catch (Exception ex) {
- logger.log(Level.INFO, "failed to get InputStream from url", ex);
- }
- return dataSource.getInputStream();
- }
- }
-}
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-04-23 17:32:43 UTC (rev 2771)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-04-24 21:32:00 UTC (rev 2772)
@@ -10,6 +10,7 @@
import javax.sound.sampled.DataLine;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
+import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
import org.me4se.impl.BasicMMPlayer;
@@ -77,7 +78,19 @@
float rate = audioFormat.getSampleRate();
AudioFormat af = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, rate, 16, ch, ch * 2, rate, false);
if (AudioSystem.isConversionSupported(af, audioFormat)) {
- clip.open(AudioSystem.getAudioInputStream(af, audioInputStream));
+ try {
+ clip.open(AudioSystem.getAudioInputStream(af, audioInputStream));
+ }
+ catch (LineUnavailableException ex) {
+ // as we have already tried to play the audio stream, its messed up,
+ // so we need to reset it and try again
+ audioInputStream = null;
+ getAudioInputStream();
+ // make it shorter and try again
+ AudioInputStream output = AudioSystem.getAudioInputStream(af, audioInputStream);
+ output = new AudioInputStream(output, af, 1000000);
+ clip.open(output);
+ }
}
else {
LOGGER.info("WARN: standard open and conversion failed, trying fallback for " + dataSource.getLocator());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-04-23 17:32:45
|
Revision: 2771
http://sourceforge.net/p/swingme/code/2771
Author: yuranet
Date: 2024-04-23 17:32:43 +0000 (Tue, 23 Apr 2024)
Log Message:
-----------
giving up on JLayerPlayer for now
Modified Paths:
--------------
me4se/src/javax/microedition/media/Manager.java
me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
Modified: me4se/src/javax/microedition/media/Manager.java
===================================================================
--- me4se/src/javax/microedition/media/Manager.java 2024-04-21 21:27:57 UTC (rev 2770)
+++ me4se/src/javax/microedition/media/Manager.java 2024-04-23 17:32:43 UTC (rev 2771)
@@ -93,12 +93,13 @@
// there is a error when using the standard wave player on java 1.5 with long mp3 files
// "Failed to allocate clip data: Requested buffer too large."
// so we will try and use a direct JLayer player, on java 1.6 this error does not happen
- if (ct.equals("audio/mpeg") && "1.5".equals(System.getProperty("java.specification.version"))) {
- className = "media.audio.JLayerPlayerImpl";
- }
- else {
+ //if (ct.equals("audio/mpeg") && "1.5".equals(System.getProperty("java.specification.version"))) {
+ // JLayerPlayerImpl causes system instability, JVM crashes
+ // className = "media.audio.JLayerPlayerImpl";
+ //}
+ //else {
className = "media.audio.WavePlayerImpl";
- }
+ //}
}
else if(ct.startsWith("video")){
className = "media.video.VideoPlayerImpl";
Modified: me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java 2024-04-21 21:27:57 UTC (rev 2770)
+++ me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java 2024-04-23 17:32:43 UTC (rev 2771)
@@ -3,6 +3,8 @@
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.net.URL;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -20,6 +22,8 @@
private static Logger logger = Logger.getLogger(JLayerPlayerImpl.class.getName());
+ private static ExecutorService executorService = Executors.newSingleThreadExecutor();
+
private final AtomicReference player = new AtomicReference();
public JLayerPlayerImpl() {
@@ -62,10 +66,19 @@
public void stop() {
//playThread.interrupt(); // this does not work
player.compareAndSet(this, null);
- AdvancedPlayer player = currentJLayerPlayer;
- if (player != null) player.close(); // stop() is the same as close, but also fires PlaybackListener
+ final AdvancedPlayer player = currentJLayerPlayer;
+ if (player != null) {
+ // we need to only do close from own thread as
+ // there are many locks in the sound framework
+ // and we dont want to lock the AWT Event thread
+ executorService.submit(new Runnable() {
+ public void run() {
+ player.close(); // stop() is the same as close, but also fires PlaybackListener
+ }
+ });
+ }
}
-
+
public boolean isRunning() {
return player.get() == this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-04-21 21:27:58
|
Revision: 2770
http://sourceforge.net/p/swingme/code/2770
Author: yuranet
Date: 2024-04-21 21:27:57 +0000 (Sun, 21 Apr 2024)
Log Message:
-----------
jlayer player works fully
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java 2024-04-21 17:18:41 UTC (rev 2769)
+++ me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java 2024-04-21 21:27:57 UTC (rev 2770)
@@ -1,20 +1,29 @@
package org.me4se.psi.java1.media.audio;
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.microedition.media.PlayerListener;
import javazoom.jl.player.advanced.AdvancedPlayer;
import javazoom.jl.player.advanced.PlaybackListener;
import org.me4se.impl.BasicMMPlayer;
-public class JLayerPlayerImpl extends BasicMMPlayer implements Runnable {
+/**
+ * This class is only needed for playing LARGE mp3 files on java 1.5
+ * all other versions of java are able to play mp3 files directly with WavePlayerImpl
+ * @see WavePlayerImpl
+ */
+public class JLayerPlayerImpl extends BasicMMPlayer {
private static Logger logger = Logger.getLogger(JLayerPlayerImpl.class.getName());
-
- private AdvancedPlayer player;
- private Thread playThread;
-
+
+ private final AtomicReference player = new AtomicReference();
+
public JLayerPlayerImpl() {
- super(true);
+ super(false);
}
public void realizeImpl() throws Exception {
@@ -26,51 +35,78 @@
}
public void startImpl() throws Exception {
- logger.info("startImpl " + this);
-
- playThread = new Thread(this, toString());
- playThread.start();
+ player.set(new Player());
}
public void stopImpl() throws Exception {
- logger.info("stopImpl " + this);
-
- playThread.interrupt(); // on its own, this does nothing
- playThread = null;
-
- player.stop(); // once we stop it, we cant reuse it, so just set it to null
- player = null;
+ ((Player)player.get()).stop();
}
- public void deallocateImpl(){
+ public void deallocateImpl() {
// System.out.println("BasicMMPlayer.deallocateImpl()");
}
- public void closeImpl(){
+ public void closeImpl() {
// stop already calls close
//player.close();
}
+
+ private class Player extends PlaybackListener implements Runnable {
+
+ private volatile AdvancedPlayer currentJLayerPlayer;
+
+ public Player() {
+ new Thread(this, "JLayerPlayer-" + String.valueOf(dataSource)).start();
+ }
+
+ public void stop() {
+ //playThread.interrupt(); // this does not work
+ player.compareAndSet(this, null);
+ AdvancedPlayer player = currentJLayerPlayer;
+ if (player != null) player.close(); // stop() is the same as close, but also fires PlaybackListener
+ }
+
+ public boolean isRunning() {
+ return player.get() == this;
+ }
+
+ public void run() {
+ startListenerNotification(PlayerListener.STARTED, null);
+ try {
+ for (int c = 0; c != loopCount && isRunning(); c++) {
- public void run() {
- logger.info("run " + loopCount + " " + this);
- try {
- for (int c = 0; c != loopCount && !Thread.interrupted(); c++) {
- logger.info("play " + c + " " + this);
-
- // player = new Player(fis);
- player = new AdvancedPlayer(dataSource.getInputStream());
- player.setPlayBackListener(new PlaybackListener() {});
+ // player = new Player(fis);
+ currentJLayerPlayer = new AdvancedPlayer(getInputStream());
+ //currentJLayerPlayer.setPlayBackListener(this);
- player.play();
+ if (!isRunning()) {
+ currentJLayerPlayer.close();
+ currentJLayerPlayer = null;
+ break;
+ }
+
+ currentJLayerPlayer.play(); // thread goes into player
+ currentJLayerPlayer = null;
+ }
}
+ catch (Exception ex) {
+ logger.log(Level.WARNING, "Error in " + Thread.currentThread(), ex);
+ }
+ player.compareAndSet(this, null);
+ startListenerNotification(PlayerListener.STOPPED, null);
}
- catch (Exception ex) {
- logger.log(Level.WARNING, "Error! " + this, ex);
+
+ private InputStream getInputStream() {
+ try {
+ String url = dataSource.getLocator();
+ if (url != null) {
+ return new BufferedInputStream(new URL(url).openStream());
+ }
+ }
+ catch (Exception ex) {
+ logger.log(Level.INFO, "failed to get InputStream from url", ex);
+ }
+ return dataSource.getInputStream();
}
- logger.info("end " + this);
}
-
- public String toString() {
- return "JLayerPlayerImpl-" + String.valueOf(dataSource);
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-04-21 17:18:43
|
Revision: 2769
http://sourceforge.net/p/swingme/code/2769
Author: yuranet
Date: 2024-04-21 17:18:41 +0000 (Sun, 21 Apr 2024)
Log Message:
-----------
started new jlayer player
Modified Paths:
--------------
me4se/build.xml
me4se/src/javax/microedition/media/Manager.java
me4se/src/javax/microedition/media/protocol/DataSource.java
Added Paths:
-----------
me4se/lib/jlayer-1.0.1.4.jar
me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
Modified: me4se/build.xml
===================================================================
--- me4se/build.xml 2024-02-11 14:17:55 UTC (rev 2768)
+++ me4se/build.xml 2024-04-21 17:18:41 UTC (rev 2769)
@@ -89,7 +89,7 @@
</patternset>
</unzip>
- <javac srcdir="src;opt/pim/src;opt/m3g/src;opt/contactless/src;opt/location/src;opt/bluetooth/src;opt/bluetooth/src_gcfimpl_avetanabt;opt/swingme/src" source="1.4" classpath="lib/emptycommapi.jar;opt/m3g/lib/jogl.jar;opt/contactless/lib/Phidget21.jar;opt/bluetooth/lib/avetanaBluetooth.jar;lib/Grasshopper.jar;opt/swingme/lib/SwingME.jar" destdir="tmpclasses" debug="on" target="1.4" encoding="Cp1252">
+ <javac srcdir="src;opt/pim/src;opt/m3g/src;opt/contactless/src;opt/location/src;opt/bluetooth/src;opt/bluetooth/src_gcfimpl_avetanabt;opt/swingme/src" source="1.4" classpath="lib/emptycommapi.jar;opt/m3g/lib/jogl.jar;opt/contactless/lib/Phidget21.jar;opt/bluetooth/lib/avetanaBluetooth.jar;lib/Grasshopper.jar;opt/swingme/lib/SwingME.jar;lib/jlayer-1.0.1.4.jar" destdir="tmpclasses" debug="on" target="1.4" encoding="Cp1252">
</javac>
Added: me4se/lib/jlayer-1.0.1.4.jar
===================================================================
(Binary files differ)
Index: me4se/lib/jlayer-1.0.1.4.jar
===================================================================
--- me4se/lib/jlayer-1.0.1.4.jar 2024-02-11 14:17:55 UTC (rev 2768)
+++ me4se/lib/jlayer-1.0.1.4.jar 2024-04-21 17:18:41 UTC (rev 2769)
Property changes on: me4se/lib/jlayer-1.0.1.4.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/java-archive
\ No newline at end of property
Modified: me4se/src/javax/microedition/media/Manager.java
===================================================================
--- me4se/src/javax/microedition/media/Manager.java 2024-02-11 14:17:55 UTC (rev 2768)
+++ me4se/src/javax/microedition/media/Manager.java 2024-04-21 17:18:41 UTC (rev 2769)
@@ -90,7 +90,15 @@
className = "media.audio.MidiPlayerImpl";
}
else if(ct.startsWith("audio")){
+ // there is a error when using the standard wave player on java 1.5 with long mp3 files
+ // "Failed to allocate clip data: Requested buffer too large."
+ // so we will try and use a direct JLayer player, on java 1.6 this error does not happen
+ if (ct.equals("audio/mpeg") && "1.5".equals(System.getProperty("java.specification.version"))) {
+ className = "media.audio.JLayerPlayerImpl";
+ }
+ else {
className = "media.audio.WavePlayerImpl";
+ }
}
else if(ct.startsWith("video")){
className = "media.video.VideoPlayerImpl";
Modified: me4se/src/javax/microedition/media/protocol/DataSource.java
===================================================================
--- me4se/src/javax/microedition/media/protocol/DataSource.java 2024-02-11 14:17:55 UTC (rev 2768)
+++ me4se/src/javax/microedition/media/protocol/DataSource.java 2024-04-21 17:18:41 UTC (rev 2769)
@@ -71,4 +71,9 @@
* @API MMAPI-1.0
*/
public abstract Control getControl(String s);
-}
\ No newline at end of file
+
+ // for debugging only
+ public String toString() {
+ return "DataSource=" + sourceLocator;
+ }
+}
Added: me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java (rev 0)
+++ me4se/src/org/me4se/psi/java1/media/audio/JLayerPlayerImpl.java 2024-04-21 17:18:41 UTC (rev 2769)
@@ -0,0 +1,76 @@
+package org.me4se.psi.java1.media.audio;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javazoom.jl.player.advanced.AdvancedPlayer;
+import javazoom.jl.player.advanced.PlaybackListener;
+import org.me4se.impl.BasicMMPlayer;
+
+public class JLayerPlayerImpl extends BasicMMPlayer implements Runnable {
+
+ private static Logger logger = Logger.getLogger(JLayerPlayerImpl.class.getName());
+
+ private AdvancedPlayer player;
+ private Thread playThread;
+
+ public JLayerPlayerImpl() {
+ super(true);
+ }
+
+ public void realizeImpl() throws Exception {
+ // System.out.println("BasicMMPlayer.realizeImpl()");
+ }
+
+ public void prefetchImpl() throws Exception {
+// logger.info("prefetchImpl " + this);
+ }
+
+ public void startImpl() throws Exception {
+ logger.info("startImpl " + this);
+
+ playThread = new Thread(this, toString());
+ playThread.start();
+ }
+
+ public void stopImpl() throws Exception {
+ logger.info("stopImpl " + this);
+
+ playThread.interrupt(); // on its own, this does nothing
+ playThread = null;
+
+ player.stop(); // once we stop it, we cant reuse it, so just set it to null
+ player = null;
+ }
+
+ public void deallocateImpl(){
+ // System.out.println("BasicMMPlayer.deallocateImpl()");
+ }
+
+ public void closeImpl(){
+ // stop already calls close
+ //player.close();
+ }
+
+ public void run() {
+ logger.info("run " + loopCount + " " + this);
+ try {
+ for (int c = 0; c != loopCount && !Thread.interrupted(); c++) {
+ logger.info("play " + c + " " + this);
+
+ // player = new Player(fis);
+ player = new AdvancedPlayer(dataSource.getInputStream());
+ player.setPlayBackListener(new PlaybackListener() {});
+
+ player.play();
+ }
+ }
+ catch (Exception ex) {
+ logger.log(Level.WARNING, "Error! " + this, ex);
+ }
+ logger.info("end " + this);
+ }
+
+ public String toString() {
+ return "JLayerPlayerImpl-" + String.valueOf(dataSource);
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-02-11 14:17:58
|
Revision: 2768
http://sourceforge.net/p/swingme/code/2768
Author: yuranet
Date: 2024-02-11 14:17:55 +0000 (Sun, 11 Feb 2024)
Log Message:
-----------
also file icon
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/FileChooser.java
Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2024-02-11 13:50:38 UTC (rev 2767)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2024-02-11 14:17:55 UTC (rev 2768)
@@ -1027,9 +1027,9 @@
if (img != null) {
img.paintIcon(this, g, (width - img.getIconWidth()) / 2, (height - img.getIconHeight()) / 2);
}
- else if (dir) {
+ else {
g.setFont(font);
- String folderIcon = "\uD83D\uDCC1";
+ String folderIcon = dir ? "\uD83D\uDCC1" : "\uD83D\uDCC4";
g.drawString(folderIcon, (width - font.getWidth(folderIcon)) / 2, (height - font.getHeight()) / 2);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-02-11 13:50:39
|
Revision: 2767
http://sourceforge.net/p/swingme/code/2767
Author: yuranet
Date: 2024-02-11 13:50:38 +0000 (Sun, 11 Feb 2024)
Log Message:
-----------
defualt folder icon
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/FileChooser.java
Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2024-02-03 18:44:22 UTC (rev 2766)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2024-02-11 13:50:38 UTC (rev 2767)
@@ -31,6 +31,7 @@
import net.yura.mobile.gui.celleditor.TableCellEditor;
import net.yura.mobile.gui.cellrenderer.ListCellRenderer;
import net.yura.mobile.gui.layout.BorderLayout;
+import net.yura.mobile.gui.layout.XULLoader;
import net.yura.mobile.gui.plaf.Style;
import net.yura.mobile.io.FileUtil;
import net.yura.mobile.logging.Logger;
@@ -180,8 +181,8 @@
private void calcThumbSize(int w,int h) {
if (gridView.isSelected()) {
- thumbSize = ( (h > w) ? w : h )/10 + 30;
- fileTable.setRowHeight( thumbSize + 5 ); // some padding
+ thumbSize = ( (h > w) ? w : h )/10 + XULLoader.adjustSizeToDensity(30);
+ fileTable.setRowHeight( thumbSize + XULLoader.adjustSizeToDensity(5) ); // some padding
}
else {
int extraPadding = 6; // some padding
@@ -791,14 +792,14 @@
return i>=s?s-1:i;
}
-public void fireActionPerformed() {
- if (editingRow>=0 && editingColumn>=0) {
- editCellAt(editingRow, editingColumn);
- if (editorComp instanceof Button) {
- ((Button)editorComp).fireActionPerformed();
+ public void fireActionPerformed() {
+ if (editingRow>=0 && editingColumn>=0) {
+ editCellAt(editingRow, editingColumn);
+ if (editorComp instanceof Button) {
+ ((Button)editorComp).fireActionPerformed();
+ }
+ }
}
- }
-}
//,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
@@ -879,8 +880,6 @@
public void clearSelection() {
selected = null;
}
-
-
}
class SelectableFile {
@@ -1000,9 +999,7 @@
g.setColor( getForeground() );
if (gridView.isSelected()) {
- if (img != null) {
- img.paintIcon(this, g, (width - img.getIconWidth()) / 2, (height - img.getIconHeight()) / 2);
- }
+ paintIcon(g, dir, img, width, height);
if (dir) {
g.setFont(font);
int length = font.getWidth(name);
@@ -1013,16 +1010,10 @@
int offset = TextComponent.searchStringCharOffset(name, font, width -(padding*2) -font.getWidth(Label.extension));
g.drawString(name.substring(0, offset) + Label.extension, padding, height - font.getHeight());
}
-
}
}
else {
- if (img != null) {
- img.paintIcon(this, g, (thumbSize - img.getIconWidth()) / 2, (height - img.getIconHeight()) / 2);
- }
- else {
- // thumbSize = 0;
- }
+ paintIcon(g, dir, img, thumbSize, height);
g.setFont(font);
g.drawString(name, thumbSize, (height - font.getHeight()) / 2);
}
@@ -1032,6 +1023,17 @@
}
}
+ private void paintIcon(Graphics2D g, boolean dir, Icon img, int width, int height) {
+ if (img != null) {
+ img.paintIcon(this, g, (width - img.getIconWidth()) / 2, (height - img.getIconHeight()) / 2);
+ }
+ else if (dir) {
+ g.setFont(font);
+ String folderIcon = "\uD83D\uDCC1";
+ g.drawString(folderIcon, (width - font.getWidth(folderIcon)) / 2, (height - font.getHeight()) / 2);
+ }
+ }
+
public Component getListCellRendererComponent(Component list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
tbOption = (SelectableFile) value;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-02-03 18:44:24
|
Revision: 2766
http://sourceforge.net/p/swingme/code/2766
Author: yuranet
Date: 2024-02-03 18:44:22 +0000 (Sat, 03 Feb 2024)
Log Message:
-----------
can play mp3 in java 1.5
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-01-30 20:50:29 UTC (rev 2765)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-02-03 18:44:22 UTC (rev 2766)
@@ -1,6 +1,7 @@
package org.me4se.psi.java1.media.audio;
import java.net.URL;
+import java.util.logging.Logger;
import javax.microedition.media.PlayerListener;
import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.AudioInputStream;
@@ -9,37 +10,33 @@
import javax.sound.sampled.DataLine;
import javax.sound.sampled.LineEvent;
import javax.sound.sampled.LineListener;
-import org.me4se.impl.BasicMMDataSource;
+import javax.sound.sampled.SourceDataLine;
import org.me4se.impl.BasicMMPlayer;
public class WavePlayerImpl extends BasicMMPlayer implements LineListener {
- public WavePlayerImpl(){
+ private static final Logger LOGGER = Logger.getLogger(WavePlayerImpl.class.getName());
+
+ public WavePlayerImpl() {
super(false);
}
- BasicMMDataSource source;
Clip clip;
AudioInputStream audioInputStream;
AudioFormat audioFormat;
DataLine.Info info;
-
- public void setSource(BasicMMDataSource ds){
- this.source = ds;
- }
-
private AudioInputStream getAudioInputStream() throws Exception {
if (audioInputStream == null) {
try {
- // if we can avoid loading all the bytes into mem, lets try and avoid it
- audioInputStream = AudioSystem.getAudioInputStream(new URL(source.getLocator()));
+ audioInputStream = AudioSystem.getAudioInputStream(new URL(dataSource.getLocator()));
}
catch (Exception ex) {
- System.out.println("WARN! Failed to load with url, falling back to loading all data. " + ex);
+ LOGGER.warning("WARN! Failed to load with url, falling back to loading all data. " + ex);
//audioInputStream = AudioSystem.getAudioInputStream(new BufferedInputStream(source.getInputStream(), 1024));
- audioInputStream = AudioSystem.getAudioInputStream(source.getInputStream());
+ //audioInputStream = AudioSystem.getAudioInputStream(new File(new URL(dataSource.getLocator()).getPath()));
+ audioInputStream = AudioSystem.getAudioInputStream(dataSource.getInputStream());
}
}
@@ -49,38 +46,44 @@
public void realizeImpl() throws Exception {
getAudioInputStream();
audioFormat = audioInputStream.getFormat();
- System.out.println("AudioFormat = " + audioFormat.toString());
+ LOGGER.fine("AudioFormat = " + audioFormat.toString());
info = new DataLine.Info(Clip.class, audioInputStream.getFormat(), ((int) audioInputStream.getFrameLength() * audioFormat.getFrameSize()));
if(audioFormat.getFrameRate() != AudioSystem.NOT_SPECIFIED){
duration = (long) (audioInputStream.getFrameLength() * 1000000 / audioFormat.getFrameRate());
-
// System.out.println("Audio clip duration: "+duration/1000+" ms");
}
}
-
-
public void startImpl() throws Exception {
- System.out.println("Start called for clip: "+clip);
+ LOGGER.fine("Start called for clip: "+clip);
if(clip == null){
getAudioInputStream();
- try {
+ if (AudioSystem.isLineSupported(info)) {
clip = (Clip) AudioSystem.getLine(info);
+ }
+ else {
+ clip = AudioSystem.getClip();
+ }
+
+ if (AudioSystem.isLineSupported(new DataLine.Info(SourceDataLine.class, audioInputStream.getFormat(), AudioSystem.NOT_SPECIFIED))) {
+ // we can only attempt to call clip.open once, if it fails, we need to re-create the audioInputStream
+ // thats why we use lots of if-checks, and not try-catches
clip.open(audioInputStream);
}
- catch (Exception ex) {
- clip = AudioSystem.getClip();
- try {
+ else {
+ int ch = audioFormat.getChannels();
+ float rate = audioFormat.getSampleRate();
+ AudioFormat af = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, rate, 16, ch, ch * 2, rate, false);
+ if (AudioSystem.isConversionSupported(af, audioFormat)) {
+ clip.open(AudioSystem.getAudioInputStream(af, audioInputStream));
+ }
+ else {
+ LOGGER.info("WARN: standard open and conversion failed, trying fallback for " + dataSource.getLocator());
+ // fallback for odd au files like 'attack.au' or 'won-against-all-troops-medieval.au' maybe 'Victory2.au'
clip.open(audioInputStream);
}
- catch (Exception ex2) {
- // for some reason jlayer mp3 does not play with default setting, but these work
- final int ch = audioFormat.getChannels();
- final float rate = audioFormat.getSampleRate();
- clip.open(AudioSystem.getAudioInputStream(new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, rate, 16, ch, ch * 2, rate, false), audioInputStream));
- }
}
clip.addLineListener(this);
@@ -96,8 +99,7 @@
startListenerNotification(PlayerListener.STARTED, null);
}
}
-
-
+
public void stopImpl() throws Exception{
if(clip != null){
desiredTime = clip.getMicrosecondPosition();
@@ -112,14 +114,11 @@
}
}
-
public void update(LineEvent event) {
- System.out.println("Event: "+event +"; clip: "+clip);
+ LOGGER.fine("Event: "+event +"; clip: "+clip);
-
LineEvent.Type type = event.getType();
-
-
+
if(type.equals(LineEvent.Type.STOP)){
if(clip != null && (loopCount > 1 || loopCount == -1)){
notifyListeners(PlayerListener.END_OF_MEDIA, null);
@@ -156,7 +155,7 @@
public String getContentType() {
- return source.getContentType();
+ return dataSource.getContentType();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-01-30 20:50:31
|
Revision: 2765
http://sourceforge.net/p/swingme/code/2765
Author: yuranet
Date: 2024-01-30 20:50:29 +0000 (Tue, 30 Jan 2024)
Log Message:
-----------
can play other files, like mp3
Modified Paths:
--------------
iOSME/src/javax/microedition/media/AudioPlayer.java
iOSME/src/javax/microedition/media/Manager.java
iOSME/src/javax/microedition/media/Player.java
Modified: iOSME/src/javax/microedition/media/AudioPlayer.java
===================================================================
--- iOSME/src/javax/microedition/media/AudioPlayer.java 2024-01-29 17:15:53 UTC (rev 2764)
+++ iOSME/src/javax/microedition/media/AudioPlayer.java 2024-01-30 20:50:29 UTC (rev 2765)
@@ -49,6 +49,7 @@
@Override
public Control getControl(String controlType) {
+ // TODO control things like volume
return null;
}
@@ -59,7 +60,8 @@
@Override
public void addPlayerListener(PlayerListener playerListener) {
-
+ // TODO
+ //player.setDelegate(new AVAudioPlayerDelegate() {...});
}
@Override
@@ -74,6 +76,8 @@
@Override
public String getContentType() {
+ //player.format();
+ //player.url();
return null; // TODO
}
@@ -87,14 +91,18 @@
return (long) (player.currentTime() * SECONDS_MICROSECOND);
}
+ /**
+ * UNREALIZED -> REALIZED -> PREFETCHED -> STARTED
+ */
@Override
public int getState() {
- return player.isPlaying() ? STARTED : UNREALIZED;
+ return player.isPlaying() ? STARTED : REALIZED;
}
@Override
public void prefetch() throws MediaException {
// not needed
+ //player.prepareToPlay();
}
@Override
Modified: iOSME/src/javax/microedition/media/Manager.java
===================================================================
--- iOSME/src/javax/microedition/media/Manager.java 2024-01-29 17:15:53 UTC (rev 2764)
+++ iOSME/src/javax/microedition/media/Manager.java 2024-01-30 20:50:29 UTC (rev 2765)
@@ -30,16 +30,12 @@
else if (TONE_DEVICE_LOCATOR.equals(locator)) {
player = new TonePlayer();
}
+ else if (locator.startsWith("file://")) {
+ player = new AudioPlayer(locator);
+ }
else {
- // if its "file://path/to/file.au"
// TODO or "http://abc.wav"
-
- if (locator.endsWith(".au")) {
- player = new AudioPlayer(locator);
- }
- else {
- throw new MediaException("unsupported format: " + locator);
- }
+ throw new MediaException("unsupported format: " + locator);
}
return player;
Modified: iOSME/src/javax/microedition/media/Player.java
===================================================================
--- iOSME/src/javax/microedition/media/Player.java 2024-01-29 17:15:53 UTC (rev 2764)
+++ iOSME/src/javax/microedition/media/Player.java 2024-01-30 20:50:29 UTC (rev 2765)
@@ -1,20 +1,22 @@
package javax.microedition.media;
public interface Player extends Controllable {
+
static int CLOSED = 0;
- static int UNREALIZED = 100;
+ static int UNREALIZED = 100;
static int REALIZED = 200;
- static int PREFETCHED = 300;
+ static int PREFETCHED = 300;
static int STARTED = 400;
- static long TIME_UNKNOWN = -1l;
+ static long TIME_UNKNOWN = -1L;
+
void addPlayerListener(PlayerListener playerListener);
- void close() ;
- void deallocate() ;
- String getContentType() ;
- long getDuration() ;
+ void close();
+ void deallocate();
+ String getContentType();
+ long getDuration();
long getMediaTime();
- int getState() ;
+ int getState();
void prefetch() throws MediaException;
void realize() throws MediaException;
void removePlayerListener(PlayerListener playerListener);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-01-29 17:15:57
|
Revision: 2764
http://sourceforge.net/p/swingme/code/2764
Author: yuranet
Date: 2024-01-29 17:15:53 +0000 (Mon, 29 Jan 2024)
Log Message:
-----------
support playing mp3
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-01-25 02:54:27 UTC (rev 2763)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-01-29 17:15:53 UTC (rev 2764)
@@ -57,22 +57,32 @@
// System.out.println("Audio clip duration: "+duration/1000+" ms");
}
}
-
-
+
+
public void startImpl() throws Exception {
System.out.println("Start called for clip: "+clip);
-
+
if(clip == null){
getAudioInputStream();
-
+
try {
clip = (Clip) AudioSystem.getLine(info);
+ clip.open(audioInputStream);
}
catch (Exception ex) {
clip = AudioSystem.getClip();
+ try {
+ clip.open(audioInputStream);
+ }
+ catch (Exception ex2) {
+ // for some reason jlayer mp3 does not play with default setting, but these work
+ final int ch = audioFormat.getChannels();
+ final float rate = audioFormat.getSampleRate();
+ clip.open(AudioSystem.getAudioInputStream(new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, rate, 16, ch, ch * 2, rate, false), audioInputStream));
+ }
}
- clip.open(audioInputStream);
+
clip.addLineListener(this);
if(desiredTime != -1){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-01-25 02:54:34
|
Revision: 2763
http://sourceforge.net/p/swingme/code/2763
Author: yuranet
Date: 2024-01-25 02:54:27 +0000 (Thu, 25 Jan 2024)
Log Message:
-----------
can load InputStream audio
Modified Paths:
--------------
iOSME/src/javax/microedition/media/AudioPlayer.java
iOSME/src/javax/microedition/media/Manager.java
Modified: iOSME/src/javax/microedition/media/AudioPlayer.java
===================================================================
--- iOSME/src/javax/microedition/media/AudioPlayer.java 2024-01-18 16:38:19 UTC (rev 2762)
+++ iOSME/src/javax/microedition/media/AudioPlayer.java 2024-01-25 02:54:27 UTC (rev 2763)
@@ -4,9 +4,13 @@
import org.moe.natj.general.ptr.Ptr;
import org.moe.natj.general.ptr.impl.PtrFactory;
import java.io.IOException;
+import java.io.InputStream;
import apple.avfaudio.AVAudioPlayer;
+import apple.foundation.NSData;
import apple.foundation.NSError;
import apple.foundation.NSURL;
+import apple.uniformtypeidentifiers.UTType;
+import libcore.io.Streams;
class AudioPlayer implements Player {
@@ -16,22 +20,28 @@
private final static double SECONDS_MICROSECOND = 1_000_000D;
- public AudioPlayer(String locator) throws IOException {
+ public AudioPlayer(InputStream ins, String mimeType) throws IOException, MediaException {
- NSURL nsUrl = iOSUtil.toNSURL(locator);
+ UTType type = UTType.typeWithMIMEType(mimeType);
+ if (type == null) {
+ throw new MediaException("unknown media type: " + mimeType);
+ }
- //if its a connection from the bundle, we can work out the url and just pass that to the audio system
- //if (ins instanceof FileInputStream) {
- // FileInputStream in = (FileInputStream) ins;
- //}
- //byte[] bytes = Streams.readFully(ins);
- //NSData data = iOSUtil.toNSData(bytes, 0, bytes.length);
- //player = AVAudioPlayer.alloc().initWithDataError(data, outError);
+ byte[] bytes = Streams.readFully(ins);
+ NSData data = iOSUtil.toNSData(bytes, 0, bytes.length);
Ptr<NSError> outError = PtrFactory.newObjectReference(NSError.class);
+ player = AVAudioPlayer.alloc().initWithDataFileTypeHintError(data, type.identifier(), outError);
+ if (outError.get() != null) {
+ throw new IOException("AVAudioPlayer Error: " + outError.get());
+ }
+ }
+ public AudioPlayer(String locator) throws IOException {
+ NSURL nsUrl = iOSUtil.toNSURL(locator);
+
+ Ptr<NSError> outError = PtrFactory.newObjectReference(NSError.class);
player = AVAudioPlayer.alloc().initWithContentsOfURLError(nsUrl, outError);
-
if (outError.get() != null) {
throw new IOException("AVAudioPlayer Error: " + outError.get());
}
Modified: iOSME/src/javax/microedition/media/Manager.java
===================================================================
--- iOSME/src/javax/microedition/media/Manager.java 2024-01-18 16:38:19 UTC (rev 2762)
+++ iOSME/src/javax/microedition/media/Manager.java 2024-01-25 02:54:27 UTC (rev 2763)
@@ -15,7 +15,7 @@
* Tone sequences: audio/x-tone-seq
*/
public static Player createPlayer(java.io.InputStream ins, String type) throws IOException, MediaException {
- throw new MediaException("unsupported");
+ return new AudioPlayer(ins, type);
}
public static Player createPlayer(String locator) throws IOException, MediaException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-01-18 16:38:21
|
Revision: 2762
http://sourceforge.net/p/swingme/code/2762
Author: yuranet
Date: 2024-01-18 16:38:19 +0000 (Thu, 18 Jan 2024)
Log Message:
-----------
handle getLine error
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-01-17 20:00:57 UTC (rev 2761)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-01-18 16:38:19 UTC (rev 2762)
@@ -65,8 +65,13 @@
if(clip == null){
getAudioInputStream();
-
- clip = (Clip) AudioSystem.getLine(info);
+
+ try {
+ clip = (Clip) AudioSystem.getLine(info);
+ }
+ catch (Exception ex) {
+ clip = AudioSystem.getClip();
+ }
clip.open(audioInputStream);
clip.addLineListener(this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-01-17 20:01:07
|
Revision: 2761
http://sourceforge.net/p/swingme/code/2761
Author: yuranet
Date: 2024-01-17 20:00:57 +0000 (Wed, 17 Jan 2024)
Log Message:
-----------
one bundle part 2
Modified Paths:
--------------
iOSME/src/net/yura/ios/WebViewController.java
Modified: iOSME/src/net/yura/ios/WebViewController.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewController.java 2024-01-17 19:58:42 UTC (rev 2760)
+++ iOSME/src/net/yura/ios/WebViewController.java 2024-01-17 20:00:57 UTC (rev 2761)
@@ -85,7 +85,7 @@
if (file.toLowerCase().endsWith(".txt")) {
// we want to load text as UTF-8, as by default iOS seems to use some other encoding
NSData data = NSData.dataWithContentsOfURL(htmlFileUrl);
- myWebView.loadDataMIMETypeCharacterEncodingNameBaseURL(data, "text/plain", "UTF-8", mainBundle.resourceURL());
+ myWebView.loadDataMIMETypeCharacterEncodingNameBaseURL(data, "text/plain", "UTF-8", iOSUtil.MAIN_BUNDLE.resourceURL());
setTitle(file.substring(0, file.lastIndexOf('.')));
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
