|
@@ -25,10 +25,10 @@ package com.dmdirc.addons.mediasources.dcop;
|
25
|
25
|
import com.dmdirc.addons.nowplaying.MediaSource;
|
26
|
26
|
import com.dmdirc.addons.nowplaying.MediaSourceManager;
|
27
|
27
|
import com.dmdirc.plugins.Plugin;
|
|
28
|
+import com.dmdirc.plugins.PluginInfo;
|
28
|
29
|
import com.dmdirc.plugins.PluginManager;
|
29
|
30
|
|
30
|
31
|
import java.util.ArrayList;
|
31
|
|
-import java.util.Arrays;
|
32
|
32
|
import java.util.List;
|
33
|
33
|
|
34
|
34
|
/**
|
|
@@ -52,24 +52,36 @@ public class DcopMediaSourcePlugin extends Plugin
|
52
|
52
|
}
|
53
|
53
|
|
54
|
54
|
/** {@inheritDoc} */
|
|
55
|
+ @Override
|
55
|
56
|
public List<MediaSource> getSources() {
|
56
|
57
|
return sources;
|
57
|
58
|
}
|
58
|
59
|
|
59
|
60
|
/** {@inheritDoc} */
|
|
61
|
+ @Override
|
60
|
62
|
public void onLoad() {
|
61
|
63
|
}
|
62
|
64
|
|
63
|
65
|
/** {@inheritDoc} */
|
|
66
|
+ @Override
|
64
|
67
|
public void onUnload() {
|
65
|
68
|
}
|
66
|
69
|
|
67
|
70
|
/** {@inheritDoc} */
|
|
71
|
+ @Override
|
68
|
72
|
public boolean checkPrerequisites() {
|
69
|
|
- if (Arrays.asList(PluginManager.getPluginManager().getMainClassNames()).
|
70
|
|
- contains("com.dmdirc.addons.dcop.DcopPlugin")) {
|
71
|
|
- return true;
|
|
73
|
+ PluginManager.getPluginManager().addPlugin("dcop.jar");
|
|
74
|
+
|
|
75
|
+ final PluginInfo pi = PluginManager.getPluginManager().getPluginInfoByName("dcop");
|
|
76
|
+
|
|
77
|
+ if (pi == null) {
|
|
78
|
+ return false;
|
72
|
79
|
}
|
73
|
|
- return false;
|
|
80
|
+
|
|
81
|
+ if (!pi.isLoaded()) {
|
|
82
|
+ pi.loadPlugin();
|
|
83
|
+ }
|
|
84
|
+
|
|
85
|
+ return true;
|
74
|
86
|
}
|
75
|
87
|
}
|