jfMedia 0.12

pquiring · Apr 25, 2017 · 001d7ce · 001d7ce
1 parent f25012d
commit 001d7ce
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/projects/jfmedia/build.xml b/projects/jfmedia/build.xml
@@ -6,7 +6,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="classpath" location="javaforce.jar"/>
-  <property name="version" value="0.11"/>
+  <property name="version" value="0.12"/>
 
   <import file="../../base.xml"/>
 

diff --git a/projects/jfmedia/src/MainPanel.java b/projects/jfmedia/src/MainPanel.java
@@ -38,7 +38,9 @@ public MainPanel() {
     video = xml.addTag(library, "Video", "", "");
     video.isLeaf = true;  //avoid showing files in JTree
 //    playlists = xml.addTag(xml.root, "Play Lists", "", "");
-    media = xml.addTag(xml.root, "Media", "", "");
+    if (!JF.isWindows()) {
+      media = xml.addTag(xml.root, "Media", "", "");
+    }
     addLibrary(new File(JF.getUserPath() + "/Music"));
     addLibrary(new File(JF.getUserPath() + "/Videos"));
     showAll();
@@ -233,9 +235,9 @@ private void treeValueChanged(javax.swing.event.TreeSelectionEvent evt) {//GEN-F
     if (cnt != 1) return;
     XML.XMLTag tag = xml.getTag(tree.getSelectionPath());
     if (tag == xml.root) return;
-    if (tag == media) {
+    if (media != null && tag == media) {
       listDiscs();
-    } if (tag.getParent() == media) {
+    } if (media != null && tag.getParent() == media) {
       currentIdx = -1;  //BUG : status will no longer get updated
       listDisc(tag);
     } else {
@@ -394,6 +396,7 @@ private boolean isMediaVideo(String fn) {
     if (fn.endsWith(".h263")) return true;
     if (fn.endsWith(".h264")) return true;
     if (fn.endsWith(".webm")) return true;
+    if (fn.endsWith(".mov")) return true;
     return false;
   }
 
@@ -544,7 +547,10 @@ private void listDiscs() {
       xml.deleteTag(media.getChildAt(a));
     }
     File file = new File("/media");
+    if (!file.exists()) return;
+    if (!file.isDirectory()) return;
     File folders[] = file.listFiles();
+    if (folders == null) return;
     cnt = folders.length;
     int discNo = 1;
     for(int a=0;a<cnt;a++) {

diff --git a/projects/jfmedia/src/MediaApp.java b/projects/jfmedia/src/MediaApp.java
@@ -12,7 +12,7 @@
 
 public class MediaApp extends javax.swing.JFrame {
 
-  public static String version = "0.11";
+  public static String version = "0.12";
 
   /**
    * Creates new form MediaApp

diff --git a/projects/jfmedia/whatsnew.txt b/projects/jfmedia/whatsnew.txt
@@ -1,6 +1,9 @@
 ChangeLog
 ---------
 
+Apr 25, 2017 : v0.12 released!
+  - fixed decoding files with metadata
+
 Sept 20, 2014 : v0.10 released!
   - new : video frame was changed into a video panel and integrated into main frame
     - added a full screen button

diff --git a/projects/jfmedia/wix32.xml b/projects/jfmedia/wix32.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{C9228ACC-4833-4BE2-A121-C7617A2130F2}" Version="0.11" Language="1033" Name="jfMedia" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{C9228ACC-4833-4BE2-A121-C7617A2130F2}" Version="0.12" Language="1033" Name="jfMedia" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />

diff --git a/projects/jfmedia/wix64.xml b/projects/jfmedia/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{C9228ACC-4833-4BE2-A121-C7617A2130F2}" Version="0.11" Language="1033" Name="jfMedia" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{C9228ACC-4833-4BE2-A121-C7617A2130F2}" Version="0.12" Language="1033" Name="jfMedia" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />