diff --git a/sigIRCv2.jar b/sigIRCv2.jar index a57947a..e93d5e9 100644 Binary files a/sigIRCv2.jar and b/sigIRCv2.jar differ diff --git a/src/sig/modules/TwitchModule.java b/src/sig/modules/TwitchModule.java index 712c9d3..75151a5 100644 --- a/src/sig/modules/TwitchModule.java +++ b/src/sig/modules/TwitchModule.java @@ -41,7 +41,7 @@ import sig.utils.TimeUtils; public class TwitchModule extends Module{ public String console="Twitch module goes here."; final public static String USERDIR = sigIRC.BASEDIR+"sigIRC/users/"; - final public static String SOUNDSDIR = sigIRC.BASEDIR+"sigIRC/sounds/"; + final public static String SOUNDSDIR = sigIRC.BASEDIR+"sigIRC/follower_sounds/"; final public static String FOLLOWERQUEUEFILE = USERDIR+"followers.txt"; public static boolean streamOnline = false; static BufferedImage follower_img; @@ -76,6 +76,7 @@ public class TwitchModule extends Module{ boolean firstTime = false; InitializeImages(); InitializeStatistics(); + InitializeFollowerSounds(); firstTime = CreateUserFolder(); if (firstTime) { CreateFollowerQueueLog(); @@ -127,6 +128,26 @@ public class TwitchModule extends Module{ });*/ } + private void InitializeFollowerSounds() { + File follower_sounds_dir = new File(SOUNDSDIR); + String[] files = filterFiles(follower_sounds_dir.list()); + followersounds = files; + //System.out.println(Arrays.toString(followersounds)); + } + + private static String[] filterFiles(String[] files) { + List finallist = new ArrayList(); + for (String file : files) { + if (!file.equalsIgnoreCase("README.txt")) { + File f = new File(SOUNDSDIR+file); + if (!f.isDirectory()) { + finallist.add(file); + } + } + } + return finallist.toArray(new String[finallist.size()]); + } + private void InitializeStatistics() { viewers_numb = new FancyNumber("icon_viewers_count.png",0); views_numb = new FancyNumber("icon_views_count.png",0); diff --git a/src/sig/sigIRC.java b/src/sig/sigIRC.java index ee61c8d..e46aecd 100644 --- a/src/sig/sigIRC.java +++ b/src/sig/sigIRC.java @@ -203,7 +203,9 @@ public class sigIRC{ manager = new FileManager("sigIRC/Emotes/subscribers.txt"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/logs/",true); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/sounds/",true); manager.verifyAndFetchFileFromServer(); - manager = new FileManager("sigIRC/sounds/Glaceon_cry.wav"); manager.verifyAndFetchFileFromServer(); + //manager = new FileManager("sigIRC/sounds/Glaceon_cry.wav"); manager.verifyAndFetchFileFromServer(); + manager = new FileManager("sigIRC/follower_sounds/Glaceon_cry.wav"); manager.verifyAndFetchFileFromServer(); + manager = new FileManager("sigIRC/follower_sounds/README.txt"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/record"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/glaceon_follower.png"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/sigIRCicon.png"); manager.verifyAndFetchFileFromServer();