1
0
Fork 0

WOAH. EVEN ALBUMS WORK.

master
Ambrose Chua 2015-10-15 22:47:51 +08:00
parent e07f095a82
commit 3e1e19dbdf
6 changed files with 189 additions and 165 deletions

View File

@ -6,26 +6,12 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="cdb932d9-7e58-4d94-93a9-e7b232ef17da" name="Default" comment="IDK anymore...">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/icons/cloud-check.32.png" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/icons/cloud-download.32.png" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/icons/warning.32.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Album.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Album.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Artist.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Artist.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java" />
<list default="true" id="cdb932d9-7e58-4d94-93a9-e7b232ef17da" name="Default" comment="IT WORRRKSSSSS.">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverListController.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverListController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Item.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Item.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/model/ItemList.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/model/ItemList.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Library.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Library.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/util/LibraryManager.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/util/LibraryManager.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/Main.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/Main.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/util/PlayManager.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/util/PlayManager.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Track.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/model/Track.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/util/Util.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/util/Util.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="JavaFxApplication.iws" />
@ -86,7 +72,18 @@
<favorites_list name="JavaFxApplication" />
</component>
<component name="FileEditorManager">
<leaf />
<leaf>
<file leaf-file-name="InterfaceController.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6712673">
<caret line="193" column="59" selection-start-line="193" selection-start-column="59" selection-end-line="193" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@ -127,7 +124,6 @@
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/model/Player.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/model/Util.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/splash.fxml" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/model/Playback.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface-test.fxml" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/coveritem" />
@ -155,12 +151,13 @@
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/util/Util.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/util/PlayManager.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/util/LibraryManager.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverListController.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/Main.java" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/util/PlayManager.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverListController.java" />
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" />
</list>
</option>
</component>
@ -738,7 +735,7 @@
<workItem from="1444628999813" duration="21183000" />
<workItem from="1444700132845" duration="8032000" />
<workItem from="1444804563726" duration="30382000" />
<workItem from="1444905270596" duration="10727000" />
<workItem from="1444905270596" duration="14563000" />
</task>
<task id="LOCAL-00001" summary="Initial Commit">
<created>1444218455154</created>
@ -836,11 +833,17 @@
<option name="project" value="LOCAL" />
<updated>1444833484031</updated>
</task>
<option name="localTasksCounter" value="17" />
<task id="LOCAL-00017" summary="IT WORRRKSSSSS.">
<created>1444916488118</created>
<option name="number" value="00017" />
<option name="project" value="LOCAL" />
<updated>1444916488118</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="101709000" />
<option name="totallyTimeSpent" value="105545000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -863,7 +866,7 @@
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26530612" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26530612" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25285715" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15409055" sideWeight="0.6703755" order="0" side_tool="false" content_ui="combo" />
@ -871,7 +874,7 @@
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24924472" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39938557" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39868805" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@ -941,14 +944,15 @@
<MESSAGE value="JSON parsing now implemented. Let's try!" />
<MESSAGE value="Kinda working LibraryManager but requires initialized graphics" />
<MESSAGE value="IDK anymore..." />
<option name="LAST_COMMIT_MESSAGE" value="IDK anymore..." />
<MESSAGE value="IT WORRRKSSSSS." />
<option name="LAST_COMMIT_MESSAGE" value="IT WORRRKSSSSS." />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
<option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="31" />
<option name="time" value="32" />
</breakpoint-manager>
<watches-manager />
</component>
@ -989,19 +993,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider editor-type-id="MultiMarkdownFxPreviewEditor">
<state />
</provider>
<provider editor-type-id="MultiMarkdownFxHtmlEditor">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5301455">
<caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/JSONLibrary.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.20089285">
@ -1154,6 +1145,13 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.33333334">
<caret line="176" column="0" selection-start-line="176" selection-start-column="0" selection-end-line="176" selection-end-column="0" />
<folding>
<element signature="e#4006#4007#0" expanded="true" />
<element signature="e#4058#4059#0" expanded="true" />
<element signature="e#5120#5121#0" expanded="true" />
<element signature="e#6394#6395#0" expanded="true" />
<element signature="e#6448#6449#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -1236,46 +1234,35 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/Item.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.14508928">
<caret line="13" column="37" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/Track.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.9255102">
<caret line="102" column="0" selection-start-line="102" selection-start-column="0" selection-end-line="102" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1088#1089#0" expanded="true" />
<element signature="e#1133#1134#0" expanded="true" />
<element signature="e#2283#2284#0" expanded="true" />
<element signature="e#2313#2314#0" expanded="true" />
<element signature="e#2358#2359#0" expanded="true" />
<element signature="e#2386#2387#0" expanded="true" />
<element signature="e#2434#2435#0" expanded="true" />
<element signature="e#2463#2464#0" expanded="true" />
<element signature="e#2512#2513#0" expanded="true" />
<element signature="e#2539#2540#0" expanded="true" />
<element signature="e#2585#2586#0" expanded="true" />
<element signature="e#2614#2615#0" expanded="true" />
<element signature="e#2659#2660#0" expanded="true" />
<element signature="e#2687#2688#0" expanded="true" />
<element signature="e#2731#2732#0" expanded="true" />
<element signature="e#2758#2759#0" expanded="true" />
<element signature="e#2810#2811#0" expanded="true" />
<element signature="e#2844#2845#0" expanded="true" />
<element signature="e#2896#2897#0" expanded="true" />
<element signature="e#2930#2931#0" expanded="true" />
<element signature="e#2978#2979#0" expanded="true" />
<element signature="e#3006#3007#0" expanded="true" />
<element signature="e#3038#3039#0" expanded="true" />
<element signature="e#3121#3122#0" expanded="true" />
<element signature="e#1045#1046#0" expanded="true" />
<element signature="e#1090#1091#0" expanded="true" />
<element signature="e#2240#2241#0" expanded="true" />
<element signature="e#2270#2271#0" expanded="true" />
<element signature="e#2315#2316#0" expanded="true" />
<element signature="e#2343#2344#0" expanded="true" />
<element signature="e#2391#2392#0" expanded="true" />
<element signature="e#2420#2421#0" expanded="true" />
<element signature="e#2469#2470#0" expanded="true" />
<element signature="e#2496#2497#0" expanded="true" />
<element signature="e#2542#2543#0" expanded="true" />
<element signature="e#2571#2572#0" expanded="true" />
<element signature="e#2616#2617#0" expanded="true" />
<element signature="e#2644#2645#0" expanded="true" />
<element signature="e#2688#2689#0" expanded="true" />
<element signature="e#2715#2716#0" expanded="true" />
<element signature="e#2767#2768#0" expanded="true" />
<element signature="e#2801#2802#0" expanded="true" />
<element signature="e#2853#2854#0" expanded="true" />
<element signature="e#2887#2888#0" expanded="true" />
<element signature="e#2935#2936#0" expanded="true" />
<element signature="e#2963#2964#0" expanded="true" />
<element signature="e#2995#2996#0" expanded="true" />
<element signature="e#3078#3079#0" expanded="true" />
</folding>
</state>
</provider>
@ -1291,14 +1278,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/Album.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.29081634">
<caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml">
<provider selected="true" editor-type-id="JavaFX-Scene-Builder">
<state />
@ -1314,9 +1293,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.78061223">
<caret line="57" column="4" selection-start-line="57" selection-start-column="4" selection-end-line="57" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -1358,84 +1335,106 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/util/PlayManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.78571427">
<caret line="210" column="28" selection-start-line="210" selection-start-column="28" selection-end-line="210" selection-end-column="28" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#4417#4418#0" expanded="true" />
<element signature="e#4447#4448#0" expanded="true" />
<element signature="e#4604#4605#0" expanded="true" />
<element signature="e#4636#4637#0" expanded="true" />
<element signature="e#4699#4700#0" expanded="true" />
<element signature="e#4735#4736#0" expanded="true" />
<element signature="e#5831#5832#0" expanded="true" />
<element signature="e#5866#5867#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/util/LibraryManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.1071428">
<caret line="102" column="20" selection-start-line="102" selection-start-column="20" selection-end-line="102" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6122449">
<caret line="57" column="72" selection-start-line="57" selection-start-column="72" selection-end-line="57" selection-end-column="72" />
<folding>
<element signature="e#762#763#0" expanded="true" />
<element signature="e#790#791#0" expanded="true" />
<element signature="e#690#691#0" expanded="false" />
<element signature="e#718#719#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverListController.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.48979592">
<caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.65816325">
<caret line="160" column="69" selection-start-line="160" selection-start-column="69" selection-end-line="160" selection-end-column="69" />
<folding>
<element signature="e#8479#8480#0" expanded="true" />
<element signature="e#8508#8509#0" expanded="true" />
<element signature="e#8564#8565#0" expanded="true" />
<element signature="e#8601#8602#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.75510204">
<caret line="71" column="0" selection-start-line="71" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/util/Util.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.872449">
<caret line="62" column="43" selection-start-line="62" selection-start-column="43" selection-end-line="62" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider editor-type-id="MultiMarkdownFxPreviewEditor">
<state />
</provider>
<provider editor-type-id="MultiMarkdownFxHtmlEditor">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-5.172414">
<caret line="10" column="49" selection-start-line="10" selection-start-column="49" selection-end-line="10" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/Album.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.06122449">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/Item.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.19897959">
<caret line="13" column="37" selection-start-line="13" selection-start-column="37" selection-end-line="13" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/util/LibraryManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.37244898">
<caret line="102" column="20" selection-start-line="102" selection-start-column="20" selection-end-line="102" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverListController.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5969388">
<caret line="39" column="23" selection-start-line="39" selection-start-column="23" selection-end-line="39" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6938776">
<caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
<folding>
<element signature="e#2632#2633#0" expanded="true" />
<element signature="e#2670#2671#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/util/PlayManager.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6122961">
<caret line="146" column="0" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
<folding>
<element signature="e#5548#5549#0" expanded="true" />
<element signature="e#5585#5586#0" expanded="true" />
<marker date="1444919987000" expanded="true" signature="-1:-1" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6712673">
<caret line="193" column="59" selection-start-line="193" selection-start-column="59" selection-end-line="193" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

View File

@ -5,10 +5,10 @@ A self-hosted music streaming service, with a client written in JavaFX for a gra
## Features
* Host your music on you own [server](https://github.com/ambrosechua/Undefined-server).
* Stream via HTTP from anywhere around the world.
* Albums, Artists, Songs.
* Easy to use nw.js server interface.
* Host your music on you own [server](https://github.com/ambrosechua/Undefined-server). (incomplete)
* Stream via HTTP from anywhere around the world. (done)
* Albums, Artists, Songs. (done)
* Easy to use nw.js server interface. (incomplete)
## Future features

View File

@ -106,7 +106,7 @@ public class PlayManager {
} else {
if (currentTime.get().toSeconds() < 2) {
stop();
if (currentTrack.get() - 1 > 0) {
if (currentTrack.get() - 1 >= 0) {
currentTrack.set(currentTrack.get() - 1);
load(queue.get(currentTrack.get()));
play();

View File

@ -1,7 +1,6 @@
package io.makerforce.undefined.view;
import io.makerforce.undefined.model.Item;
import io.makerforce.undefined.model.ItemList;
import io.makerforce.undefined.model.*;
import javafx.fxml.FXMLLoader;
import javafx.scene.layout.FlowPane;
@ -11,6 +10,8 @@ public class CoverListController extends FlowPane {
private ItemList itemList;
private InterfaceController controller;
public CoverListController() {
FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("coverlist.fxml"));
fxmlLoader.setRoot(this);
@ -25,7 +26,15 @@ public class CoverListController extends FlowPane {
public void setItemList(ItemList list) {
itemList = list;
list.getItems().forEach(i -> {
this.getChildren().add(new CoverItemController((Item) i));
CoverItemController c = new CoverItemController((Item) i);
this.getChildren().add(c);
c.setOnMouseClicked((m) -> { // I gave up.
if (i.getClass() == Artist.class) {
controller.showCoverList((ItemList<Item>) i); // Albums
} else if (i.getClass() == Album.class) {
controller.showTrackList((ItemList<Track>) i);
}
});
});/*
this.getChildren().addAll(
(Collection<CoverItemController>)
@ -34,4 +43,8 @@ public class CoverListController extends FlowPane {
*/
}
public void setController(InterfaceController c) {
controller = c;
}
}

View File

@ -1,5 +1,8 @@
package io.makerforce.undefined.view;
import io.makerforce.undefined.model.Item;
import io.makerforce.undefined.model.ItemList;
import io.makerforce.undefined.model.Track;
import io.makerforce.undefined.util.LibraryManager;
import io.makerforce.undefined.util.PlayManager;
import io.makerforce.undefined.util.Util;
@ -91,14 +94,11 @@ public class InterfaceController {
albumList = new CoverListController();
artistList = new CoverListController();
// Temporary stuff
/*
try {
player.addToQueue(new Track(new JSONObject("{\"title\":\"Fade\",\"artist\":[\"Alan Walker\"],\"albumartist\":[\"Various Artists\"],\"album\":\"Fade\",\"year\":\"2014\",\"track\":{\"no\":7,\"of\":0},\"genre\":[\"Dance & House\"],\"disk\":{\"no\":1,\"of\":0},\"picture\":\"/art/Alan%20Walker/Fade/1\",\"duration\":0,\"number\":1,\"file\":\"/tracks/Alan%20Walker/Fade/Fade.mp3\"}"), "", "", new URL(LibraryManager.DEFAULT_ENDPOINT)));
} catch (MalformedURLException e) {
e.printStackTrace();
}
*/
albumList.setController(this);
artistList.setController(this);
scrollPane.setContent(artistList);
// UI Bindings
ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
@ -153,7 +153,7 @@ public class InterfaceController {
}, 1000); // Quick hack to trigger more frequent updates.
}
});
//libraryManager.schedule();
libraryManager.schedule();
// Player bindings
@ -222,6 +222,19 @@ public class InterfaceController {
}
public void showCoverList(ItemList<Item> i) {
CoverListController c = new CoverListController();
c.setController(this);
c.setItemList(i);
scrollPane.setContent(c);
}
public void showTrackList(ItemList<Track> i) {
TrackListController t = new TrackListController(new Image(String.valueOf(i.pictureProperty().get())), i.titleProperty().get(), i.subtitleProperty().get());
t.setItemList(i);
scrollPane.setContent(t);
}
private void clearStatusIcon(int milliseconds) {
Timer t = new Timer();
t.schedule(new TimerTask() {

View File

@ -63,7 +63,6 @@ public class TrackListController extends VBox {
InterfaceController.getPlayManager().addAllToQueue(itemList.getItems());
InterfaceController.getPlayManager().setIndex(((ObservableIntegerValue) selectedIndex).get());
//InterfaceController.getPlayManager().play();
System.out.println(((ObservableIntegerValue) selectedIndex).get());
});
}