android init and a fixx commit

.gitignore

@@ -53,6 +53,8 @@ IZSetup/distPackagerBase/64b/dist/iZsetup_setup.jar
 #special nonmaven libs
 !**/lib/*
 
+**/auxy/*
 #petzende files
 *.log
 !gradle/wrapper/*
+/IZPL-A/IZPL/.nb-gradle/private/

IZPL-A/IZPL/.gitignore

@@ -0,0 +1,81 @@
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+/*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties

IZPL-A/IZPL/app/.gitignore

@@ -0,0 +1 @@
+/build

IZPL-A/IZPL/app/build.gradle

@@ -0,0 +1,30 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.0.1"
+
+    defaultConfig {
+        applicationId "de.nplusc.izc.izpl"
+        minSdkVersion 19
+        targetSdkVersion 21
+        versionCode 1
+        versionName "1.0"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:22.1.1'
+}

IZPL-A/IZPL/app/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in D:\src\android_sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

IZPL-A/IZPL/app/src/androidTest/java/de/nplusc/izc/izpl/ApplicationTest.java

@@ -0,0 +1,13 @@
+package de.nplusc.izc.izpl;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}

IZPL-A/IZPL/app/src/main/AndroidManifest.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="de.nplusc.izc.izpl" >
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="de.nplusc.izc.izpl.Menu"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

IZPL-A/IZPL/app/src/main/java/de/nplusc/izc/izpl/Menu.java

@@ -0,0 +1,39 @@
+package de.nplusc.izc.izpl;
+
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+
+public class Menu extends ActionBarActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_menu);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

IZPL-A/IZPL/app/src/main/res/layout/activity_menu.xml

@@ -0,0 +1,23 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".Menu">
+
+    <SeekBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/seekBar"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_marginBottom="61dp"
+        android:layout_alignParentEnd="true" />
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageView"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true" />
+</RelativeLayout>

IZPL-A/IZPL/app/src/main/res/menu/menu_menu.xml

@@ -0,0 +1,6 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools" tools:context=".Menu">
+    <item android:id="@+id/action_settings" android:title="@string/action_settings"
+        android:orderInCategory="100" app:showAsAction="never" />
+</menu>

IZPL-A/IZPL/app/src/main/res/values-w820dp/dimens.xml

@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

IZPL-A/IZPL/app/src/main/res/values/dimens.xml

@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>

IZPL-A/IZPL/app/src/main/res/values/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">iZpl</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="action_settings">Settings</string>
+
+</resources>

IZPL-A/IZPL/app/src/main/res/values/styles.xml

@@ -0,0 +1,8 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+    </style>
+
+</resources>

IZPL-A/IZPL/build.gradle

@@ -0,0 +1,19 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0-rc1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

IZPL-A/IZPL/gradle.properties

@@ -0,0 +1,18 @@
+# Project-wide Gradle settings.
+
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true

IZPL-A/IZPL/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

IZPL-A/IZPL/gradlew

@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

IZPL-A/IZPL/gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

IZPL-A/IZPL/settings.gradle

@@ -0,0 +1 @@
+include ':app'

iZpl/src/main/java/de/nplusc/izc/iZpl/API/InvalidPlayListFileException.java

@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2015 iZc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.nplusc.izc.iZpl.API;
-
-/**
- *
- * @author iZc <nplusc.de>
- */
-public class InvalidPlayListFileException extends Exception
-{
-    
-}

iZpl/src/main/java/de/nplusc/izc/iZpl/API/shared/MultiPlayListItem.java

@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2015 iZc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.nplusc.izc.iZpl.API;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-/**
- *
- * @author LH
- */
-public class MultiPlayListItem implements PlayListItem
-{
-    private List<PlayListItem> containedElements=new ArrayList<>();
-    
-    private int playcount,countPlayed;
-    private String src="";
-    
-    public MultiPlayListItem(){};
-    
-    
-    public MultiPlayListItem(String[] path, String[] Title, int playcount)
-    {
-        for (int i = 0; i < Title.length; i++)
-        {
-            String t = Title[i];
-            String p = path[i];
-            containedElements.add(new SinglePlayListItem(p, t, 1));
-        }
-        this.playcount = playcount;
-        countPlayed=0; //noch nie gespielt als default; bei reload wird anderweitig verglichen :P
-    }
-
-    public List<PlayListItem> getItems()
-    {
-        return containedElements;
-    }
-    
-    public void setItems(List<PlayListItem>p)
-    {
-        containedElements=p;
-    }
-
-    public void addItem(PlayListItem e)
-    {
-        containedElements.add(e);
-    }
-    
-    public void removeElement(int i)
-    {
-        containedElements.remove(i);
-    }
-    
-    
-    public String getPath(int i)
-    {
-        PlayListItem it = containedElements.get(i);
-        if(it instanceof SinglePlayListItem)
-        {
-            return ((SinglePlayListItem)it).getPath();
-        }
-        return "";
-    }
-
-    
-    public int getElemCount()
-    {
-        return containedElements.size();
-    }
-   /* public void setPath(String path, int i)
-    {
-        this.
-        this.path.add(i, path);
-    }*/
-
-    public String getTitle(int i)
-    {
-        PlayListItem it = containedElements.get(i);
-        if(it instanceof SinglePlayListItem)
-        {
-            return ((SinglePlayListItem)it).getTitle();
-        }
-        return "";
-    }
-        
-    
-    public void addTitle(String ppath,String ptitle)
-    {
-        containedElements.add(new SinglePlayListItem(ppath, ptitle, 1));
-    }
-
-    @Override
-    public int getTargetPlaycount()
-    {
-        return playcount;
-    }
-
-    @Override
-    public void setTargetPlaycount(int playcount)
-    {
-        this.playcount = playcount;
-    }
-
-    @Override
-    public int getCountPlayed()
-    {
-        return countPlayed;
-    }
-
-    @Override
-    public void setCountPlayed(int countPlayed)
-    {
-        this.countPlayed = countPlayed;
-    }
-    
-    @Override
-    public String getM3UElement()
-    {
-        String sret = "";
-        for (PlayListItem playListItem : containedElements)
-        {
-            sret+=playListItem.getM3UElement();
-        }
-        return sret;
-    }
-
-
-    @Override
-    public int hashCode()
-    {
-        int hash = 7;
-        hash = 47 * hash + Objects.hashCode(containedElements);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        final MultiPlayListItem other = (MultiPlayListItem) obj;
-        if (!containedElements.equals(other.containedElements))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    public String getSrc()
-    {
-        return src;
-    }
-
-    public void setSrc(String src)
-    {
-        this.src = src;
-    }
-
-    @Override
-    public boolean isIncludeElement()
-    {
-        return false;
-    }
-
-    @Override
-    public boolean noexpandoninclude()
-    {
-        return false;
-    }
-    
-    public SinglePlayListItem[] getSinglePlayListElements()
-    {
-        ArrayList<SinglePlayListItem> l = new ArrayList<>();
-        for (PlayListItem playListItem : containedElements)
-        {
-            if(playListItem instanceof SinglePlayListItem)
-            {
-                l.add((SinglePlayListItem) playListItem);
-            }
-            else
-            {
-                if(playListItem instanceof MultiPlayListItem)
-                {
-                    l.addAll(Arrays.asList(((MultiPlayListItem)playListItem).getSinglePlayListElements()));
-                }
-            }
-        }
-        return (SinglePlayListItem[]) l.toArray(new SinglePlayListItem[]{});
-    }
-
-    @Override
-    public int getGID()
-    {
-       return 0;
-    }
-    
-}

iZpl/src/main/java/de/nplusc/izc/iZpl/API/shared/PlayListFile.java

@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2015 iZc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.nplusc.izc.iZpl.API;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- *
- * @author iZc <nplusc.de>
- */
-public class PlayListFile
-{
-    private List<SinglePlayListItem> entries;
-    
-    private int calculatedBasePriority=1;
-
-    public int getCalculatedBasePriority()
-    {
-        return calculatedBasePriority;
-    }
-
-    public void setCalculatedBasePriority(int calculatedBasePriority)
-    {
-        this.calculatedBasePriority = calculatedBasePriority;
-    }
-    
-    
-    public List<SinglePlayListItem> getEntries()
-    {
-        return entries;
-    }
-
-    public void setEntries(List<SinglePlayListItem> entries)
-    {
-        this.entries = entries;
-    }
-
-    public String getPath()
-    {
-        return path;
-    }
-
-    public void setPath(String path)
-    {
-        this.path = path;
-    }
-    private String path;
-
-    @Override
-    public int hashCode()
-    {
-        int hash = 3;
-        //hash = 41 * hash + Objects.hashCode(this.entries);// fickdich, du funkst beim rumfuhrwerken an den daten beim edit rein
-        hash = 41 * hash + Objects.hashCode(this.path);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        final PlayListFile other = (PlayListFile) obj;
-        if (!Objects.equals(this.entries, other.entries))
-        {
-            return false;
-        }
-        if (!Objects.equals(this.path, other.path))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString()
-    {
-        return "PlayListFile{" + "calculatedBasePriority=" + calculatedBasePriority + ", path=" + path + '}';
-    }
-    
-    
-    
-    
-}

iZpl/src/main/java/de/nplusc/izc/iZpl/API/shared/PlayListItem.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 iZc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.nplusc.izc.iZpl.API;
-
-/**
- *
- * @author LH
- */
-public interface PlayListItem
-{
-    public String getM3UElement();// erzeugt den M3U-Code zum aujsgeben an den VauEllCeh-er
-    public int getTargetPlaycount(); 
-    public void setTargetPlaycount(int playcount);
-    public int getCountPlayed();
-    public void setCountPlayed(int countPlayed);
-    public boolean isIncludeElement(); //erweiterung um daten durchzuschleusen für die TreeView
-    public boolean noexpandoninclude();
-    public int getGID();
-    
-}

iZpl/src/main/java/de/nplusc/izc/iZpl/API/shared/SinglePlayListItem.java

@@ -1,159 +0,0 @@
-/*
- * Copyright (C) 2015 iZc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.nplusc.izc.iZpl.API;
-
-import java.util.Objects;
-
-/**
- *
- * @author LH
- */
-public class SinglePlayListItem implements PlayListItem
-{
-    private String path,Title;
-    private int targetplaycount,countPlayed;
-    private boolean include,noexpandoninclude;
-    private int gid=0;
-    public SinglePlayListItem()
-    {
-    targetplaycount=1;
-    Title="";
-    path="";
-    countPlayed=0;
-    };
-    
-    public SinglePlayListItem(String path, String Title, int playcount)
-    {
-        this(path, Title, playcount, false,false);
-    }
-    
-    public SinglePlayListItem(String path, String Title, int playcount,boolean isInclude,boolean noexpandoninclude)
-    {
-        this.path = path;
-        this.Title = Title;
-        this.targetplaycount = playcount;
-        countPlayed=0; //noch nie gespielt als default; bei reload wird anderweitig verglichen :P
-        include=isInclude;
-        this.noexpandoninclude=noexpandoninclude;
-    }
-
-    public String getPath()
-    {
-        return path;
-    }
-
-    public void setPath(String path)
-    {
-        this.path = path;
-    }
-
-    public String getTitle()
-    {
-        return Title;
-    }
-
-    public void setTitle(String Title)
-    {
-        this.Title = Title;
-    }
-
-    public int getTargetPlaycount()
-    {
-        return targetplaycount;
-    }
-
-
-
-    public void setTargetPlaycount(int playcount)
-    {
-        this.targetplaycount = playcount;
-    }
-
-    public int getCountPlayed()
-    {
-        return countPlayed;
-    }
-
-    public void setCountPlayed(int countPlayed)
-    {
-        this.countPlayed = countPlayed;
-    }
-    
-    @Override
-    public String getM3UElement()
-    {
-        return "\n"+Title+"\n"+path;
-    }
-        @Override
-    public int hashCode()
-    {
-        int hash = 3;
-        hash = 23 * hash + Objects.hashCode(this.path);
-        hash = 23 * hash + Objects.hashCode(this.Title);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        final SinglePlayListItem other = (SinglePlayListItem) obj;
-        if (!Objects.equals(this.path, other.path))
-        {
-            return false;
-        }
-        return Objects.equals(this.Title, other.Title);
-    }
-
-    @Override
-    public boolean isIncludeElement()
-    {
-        return include;
-    }
-
-    @Override
-    public boolean noexpandoninclude()
-    {
-        return noexpandoninclude;
-    }
-    
-    public void setIncludeElements(boolean isInclude,boolean noExpand)
-    {
-        include=isInclude;
-        noexpandoninclude=noExpand;
-    }
-    
-    
-    public void setGID(int pgid)
-    {
-        gid=pgid;
-    }
-    
-    
-    @Override
-    public int getGID()
-    {
-        return gid;
-    }
-}

iZpl/src/main/java/de/nplusc/izc/iZpl/Utils/shared/PLFileIO.java

@@ -1,331 +0,0 @@
-/*
- * Copyright (C) 2015 iZc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package de.nplusc.izc.iZpl.Utils;
-
-import de.nplusc.izc.iZpl.API.InvalidPlayListFileException;
-import de.nplusc.izc.iZpl.API.MultiPlayListItem;
-import de.nplusc.izc.iZpl.API.PlayListFile;
-import de.nplusc.izc.iZpl.API.PlayListItem;
-import de.nplusc.izc.iZpl.API.SinglePlayListItem;
-import de.nplusc.izc.iZpl.Main;
-import de.nplusc.izc.tools.IOtools.FileTK;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.yaml.snakeyaml.Yaml;
-
-/**
- *
- * @author iZc <nplusc.de>
- */
-public class PLFileIO
-{
-    //Formatdefinition //basiert aufne verpackte #extm3u
-    /*
-    * #EXTM3U
-    * #iZPl
-    * #EXTINFO.......//Die VLC-Daten
-    * #IZPL:PrioMultiplier|GroupID (IDS !=0 sind Verbunden. 0er immer einzeln)
-    * /Pfad/zu/File1.mp3
-    * //Defaultet zu 1,0 falls nicht gefunden
-    * #IZPL:INCLUDE|PrioMultiplier|Expand//INCLUDE sagt dass hier ne referenzierte IZPL liegt Expand sagt Liste kann aufgeteilt werden
-    * /Pfad/zu/andererListe.iZpl //prioMultiplier bei include mutipliziert Multiopliers des Includes
-    * #IZPL:INCLUDE|PrioMultiplier|NoExpand //NoExpand sagt dass File Als ein Block behandelt werden muss (Includes innerhalb werden auch beachtet aber keine multiplizierungen eingebaut
-    * /Pfad/zu/UnsplittbarerListe.iZpl
-    */
-    
-    
-    private static Yaml y = new Yaml();
-    private static final Logger l = LogManager.getLogger();
-    public static List<SinglePlayListItem> readSingleList(String path) throws InvalidPlayListFileException
-    {
-        String plbd = FileTK.getFilePath(path)+File.separator;
-        l.trace("Location:{}",new File(path).getAbsolutePath());
-        try
-        {
-            boolean syntaxError=false;
-            BufferedReader fr = new BufferedReader(new FileReader(path));
-
-            if(!(fr.readLine().equalsIgnoreCase("#EXTM3U")))
-            {
-                l.error("Not a valid izpl or M3u-file");
-                return new ArrayList<>();
-            }
-            if(!fr.readLine().startsWith("#IZPL"))
-            {
-                l.info("plain M3u detected");
-            }
-            int lne=3;
-            ArrayList<SinglePlayListItem> returndata = new ArrayList<>();
-            String ln = fr.readLine();
-            boolean extinf=false;
-            SinglePlayListItem itm = new SinglePlayListItem();
-            while(ln!=null)
-            {
-                if(!ln.trim().equals(""))
-                {
-                    l.trace(ln);
-                    if(ln.startsWith("#IZPL"))
-                    {
-                        String[] meta = ln.split(":")[1].split("\\|");
-                        if(meta[0].equalsIgnoreCase("include"))
-                        {
-                            if(meta.length==3)
-                            {
-                                if(meta[2].equalsIgnoreCase("expand"))
-                                {
-                                    itm.setIncludeElements(true, false);
-                                }
-                                else
-                                {
-                                    if(meta[2].equalsIgnoreCase("noexpand"))
-                                    {
-                                         itm.setIncludeElements(true, true);
-                                    }
-                                    else
-                                    {
-                                        syntaxError=true;
-                                        l.error("Syntax error on line {} of file {}: {}",lne,path,"Include-Block haben nur Expand oder NoExpand als dritten block");
-                                        continue;
-                                    }
-                                }
-                                try
-                                {
-                                    int pr = Integer.valueOf(meta[1]);
-                                    if(pr<1)
-                                    {
-                                        throw new NumberFormatException();
-                                    }
-                                    itm.setTargetPlaycount(pr);
-                                }
-                                catch(NumberFormatException x)
-                                {
-                                    syntaxError=true;
-                                    l.error("Syntax error on line {} of file {}: {}",lne,path,"der 2. block bei Include muss eine positive Ganzzahl sein");
-                                    itm.setTargetPlaycount(1);
-                                }
-                            }
-                            else
-                            {
-                                syntaxError=true;
-                                l.error("Syntax error on line {} of file {}: {}",lne,path,"Include-Block braucht 2 weitere blöcke um korrekt zu sein");
-                            }
-                        }
-                        else
-                        {
-                            if(meta.length==2)
-                            {
-                                try
-                                {
-                                    int pr = Integer.valueOf(meta[0]);
-                                    if (pr < 1)
-                                    {
-                                        throw new NumberFormatException();
-                                    }
-                                    itm.setTargetPlaycount(pr);
-                                }
-                                catch (NumberFormatException x)
-                                {
-                                    syntaxError = true;
-                                    l.error("Syntax error on line {} of file {}: {}", lne, path, "Block1 muss eine Ganzzahl > 0 sein");
-                                    itm.setTargetPlaycount(1);
-                                }
-                                try
-                                {
-                                    l.trace(meta[1]);
-                                    int gid = Integer.valueOf(meta[1].trim());
-                                    if (gid < 0)
-                                    {
-                                        l.trace("NULL0");
-                                        throw new NumberFormatException();
-                                    }
-                                    itm.setGID(gid); 
-                                }
-                                catch (NumberFormatException x)
-                                {
-                                    syntaxError = true;
-                                    l.error("Syntax error on line {} of file {}: {}", lne, path, "Block2 muss eine Ganzzahl >=0 sein");
-                                    itm.setGID(0);
-                                }
-                            }
-                            else
-                            {
-                                syntaxError=true;
-                                l.error("Syntax error on line {} of file {}: {}",lne,path,"Could not determine Metadata block type");
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if(ln.startsWith("#EXTINF"))
-                        {
-                            extinf=true;
-                            itm.setTitle(ln);
-                        }
-                        else
-                        {
-                            if(!ln.startsWith("#"))
-                            {
-                                if(!extinf)
-                                {
-                                    itm.setTitle("#EXTINF,0,"+FileTK.getFileName(ln));
-                                }
-                                if(!(ln.substring(1).startsWith(":")||ln.startsWith(File.separator)))
-                                {
-                                    ln=plbd+ln;//relative pfade absolutisieren
-                                }
-                                itm.setPath(ln);
-                                returndata.add(itm);
-                                itm=new SinglePlayListItem();
-                                extinf=false;
-                            }
-                        }
-                    }
-                }
-                lne++;
-                ln=fr.readLine();
-            }
-            if(syntaxError)
-            {
-                throw new InvalidPlayListFileException();
-            }
-            return returndata;
-        }
-        catch (IOException ex)
-        {
-            return new ArrayList<>();
-        }
-    }
-    
-    public static List<PlayListItem> parseFullList(String path)
-    {
-        return parseFullList(path, 40);
-    }
-    
-    
-    public static List<PlayListItem> parseFullList(String path,int rd)
-    {
-        
-        HashMap<Integer,MultiPlayListItem> groups = new HashMap<>();
-        List<PlayListItem> result = new ArrayList<>();
-        try
-        {
-            List<SinglePlayListItem> rootList = readSingleList(path);
-            l.trace(y.dump(rootList));
-            for (SinglePlayListItem re : rootList)
-            {
-                if(re.isIncludeElement())
-                {
-                    if(re.noexpandoninclude())
-                    {
-                        MultiPlayListItem m = processNoExpandInclude(re.getPath(),rd);
-                        if(m!=null)
-                        {
-                            m.setTargetPlaycount(re.getTargetPlaycount());
-                            result.add(m);
-                        }
-                    }
-                    else
-                    {
-                        List<PlayListItem> temp = parseFullList(re.getPath(),rd-1);
-                        temp.forEach((ple)->ple.setTargetPlaycount(ple.getTargetPlaycount()*re.getTargetPlaycount()));
-                        result.addAll(temp);
-                    }
-                }
-                else
-                {
-                    int gid=re.getGID();
-                    if(gid==0)
-                    {
-                        result.add(re);
-                    }
-                    else
-                    {
-                        if(!groups.containsKey(gid))
-                        {
-                            groups.put(gid,new MultiPlayListItem());
-                        }
-                        MultiPlayListItem gt = groups.get(gid);
-                        gt.addItem(re);
-                    }
-                }
-            }
-        }
-        catch(InvalidPlayListFileException x)
-        {
-            l.error("Malformed file: stopping parsing");
-            Main.quickQuit();
-        }
-        return result;
-    }
-    
-    private static MultiPlayListItem processNoExpandInclude(String path,int rd) throws InvalidPlayListFileException
-    {
-        MultiPlayListItem mi = new MultiPlayListItem();
-        if(rd<0)
-        {
-            return null;
-        }
-        rd--;
-        List<SinglePlayListItem> raw = readSingleList(path);
-        for (SinglePlayListItem spi : raw)
-        {
-            if(spi.isIncludeElement())
-            {
-                mi.addItem(processNoExpandInclude(spi.getPath(), rd));
-            }
-            else
-            {
-                mi.addItem(spi);
-            }
-        }
-        return mi;
-    }
-    
-    public static void writePLFile(PlayListFile f)
-    {
-        String fp = f.getPath();
-        String pld = "#EXTM3U\n#IZPL\n";
-        for (SinglePlayListItem pli : f.getEntries())
-        {
-            if(pli.isIncludeElement())
-            {
-                pld+="#IZPL:INCLUDE|"+pli.getTargetPlaycount()+"|"+(pli.noexpandoninclude()?"NOEXPAND":"EXPAND")+"\n"+pli.getPath()+"\n";
-            }
-            else
-            {
-                pld+=pli.getTitle()+"\n"+"#IZPL:"+pli.getTargetPlaycount()+"|"+pli.getGID()+"\n"+pli.getPath()+"\n";
-            }
-        }
-        FileTK.writeFile(pld, fp);
-    }
-    
-    
-    
-    private PLFileIO()
-    {
-    }
-    
-    
-}