rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Talrijke aanpassingen gemaakt. Vorige commit gaf een fout en ik heb geen zin om informatie opnieuw te typen.

Browse Source
This commit is contained in:
Rik Veenboer
2011-02-20 12:36:53 +00:00
parent 757d4f3868
commit b77e280343
26 changed files with 704 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/javazoom/jlgui/player/amp/PlayerUI.java
View File

@@ -332,10 +332,10 @@ public class PlayerUI extends JPanel implements ActionListener, ChangeListener,
ui.getAcExit().removeActionListener(this);
ui.getAcExit().addActionListener(this);
// DSP
if (ui.getAcAnalyzer() != null)
/*if (ui.getAcAnalyzer() != null)
{
add(ui.getAcAnalyzer(), ui.getAcAnalyzer().getConstraints());
}
}*/
// Popup menu
mainpopup = new JPopupMenu(ui.getResource("popup.title"));
JMenuItem mi = new JMenuItem(Skin.TITLETEXT + "- JavaZOOM");
@@ -1173,14 +1173,14 @@ public class PlayerUI extends JPanel implements ActionListener, ChangeListener,
{
lastScrollTime = System.currentTimeMillis();
posValueJump = false;
if (audioInfo.containsKey("basicplayer.sourcedataline"))
/*if (audioInfo.containsKey("basicplayer.sourcedataline"))
{
if (ui.getAcAnalyzer() != null)
{
ui.getAcAnalyzer().setupDSP((SourceDataLine) audioInfo.get("basicplayer.sourcedataline"));
ui.getAcAnalyzer().startDSP((SourceDataLine) audioInfo.get("basicplayer.sourcedataline"));
}
}
}*/
}
else if (state == BasicPlayerEvent.SEEKING)
{
@@ -1207,11 +1207,11 @@ public class PlayerUI extends JPanel implements ActionListener, ChangeListener,
}
else if (state == BasicPlayerEvent.STOPPED)
{
if (ui.getAcAnalyzer() != null)
/*if (ui.getAcAnalyzer() != null)
{
ui.getAcAnalyzer().stopDSP();
ui.getAcAnalyzer().repaint();
}
}*/
}
}
@@ -1236,7 +1236,7 @@ public class PlayerUI extends JPanel implements ActionListener, ChangeListener,
if (audioInfo.containsKey("basicplayer.sourcedataline"))
{
// Spectrum/time analyzer
if (ui.getAcAnalyzer() != null) ui.getAcAnalyzer().writeDSP(pcmdata);
//if (ui.getAcAnalyzer() != null) ui.getAcAnalyzer().writeDSP(pcmdata);
}
if (audioInfo.containsKey("audio.length.bytes"))
{
@@ -1699,12 +1699,12 @@ public class PlayerUI extends JPanel implements ActionListener, ChangeListener,
{
config.setAudioDevice(((BasicPlayer) theSoundPlayer).getMixerName());
}
if (ui.getAcAnalyzer() != null)
/*if (ui.getAcAnalyzer() != null)
{
if (ui.getAcAnalyzer().getDisplayMode() == SpectrumTimeAnalyzer.DISPLAY_MODE_OFF) config.setVisualMode("off");
else if (ui.getAcAnalyzer().getDisplayMode() == SpectrumTimeAnalyzer.DISPLAY_MODE_SCOPE) config.setVisualMode("oscillo");
else config.setVisualMode("spectrum");
}
}*/
if (playlist != null)
{
playlist.save("default.m3u");

14
java/src/javazoom/jlgui/player/amp/skin/Skin.java
View File

@@ -40,7 +40,7 @@ import javax.swing.JSlider;
import javazoom.jlgui.player.amp.PlayerActionEvent;
import javazoom.jlgui.player.amp.equalizer.ui.SplinePanel;
import javazoom.jlgui.player.amp.util.Config;
import javazoom.jlgui.player.amp.visual.ui.SpectrumTimeAnalyzer;
//import javazoom.jlgui.player.amp.visual.ui.SpectrumTimeAnalyzer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -196,7 +196,7 @@ public class Skin
private String viscolor = null;
private int[] visualLocation = { 24, 44 };
private int[] visualSize = { 76, 15 };
private SpectrumTimeAnalyzer analyzer = null;
//private SpectrumTimeAnalyzer analyzer = null;
/*-- EqualizerUI --*/
private Image imFullEqualizer = null;
private Image imEqualizer = null;
@@ -473,7 +473,7 @@ public class Skin
acTimeIcon.setIcons(timeIcons);
acTimeIcon.setConstraints(new AbsoluteConstraints(iconsLocation[2], iconsLocation[3]));
/*-- DSP --*/
setAnalyzerPanel();
//setAnalyzerPanel();
/*-- Pos Bar --*/
readPanel(releasedPosIm, releasedPosPanel, pressedPosIm, pressedPosPanel, imPosBar);
setPosBarPanel();
@@ -724,7 +724,7 @@ public class Skin
{
log.info("DSP disabled");
}
else
/*else
{
if (analyzer == null) analyzer = new SpectrumTimeAnalyzer();
String visualMode = config.getVisualMode();
@@ -745,7 +745,7 @@ public class Skin
analyzer.setPeakDelay((int) (fps * SpectrumTimeAnalyzer.DEFAULT_SPECTRUM_ANALYSER_PEAK_DELAY_FPS_RATIO));
analyzer.setConstraints(new AbsoluteConstraints(visualLocation[0], visualLocation[1], visualSize[0], visualSize[1]));
analyzer.setToolTipText(getResource("panel.analyzer"));
}
}*/
}
/**
@@ -1343,10 +1343,10 @@ public class Skin
return acSecondL;
}
public SpectrumTimeAnalyzer getAcAnalyzer()
/*public SpectrumTimeAnalyzer getAcAnalyzer()
{
return analyzer;
}
}*/
public ActiveJButton getAcEqPresets()
{