etc/test_data/dog_1.au productions/examples/sandbox/sounds/players/clip.rb productions/examples/sandbox/sounds/props.rb productions/examples/sandbox/sounds/styles.rb src/limelight/AudioPlayer.java src/limelight/audio/MockAudioPlayer.java src/limelight/audio/RealAudioPlayer.java src/limelight/audio/RealAudioPlayerTest.java src/limelight/ui/model2/TextAccessor.java src/limelight/ui/model2/inputs/TextBoxPanel.java src/limelight/ui/model2/inputs/TextBoxPanelTest.java src/limelight/ui/model2/painting/TextBoxPainter.java @@ -23,7 +23,7 @@ module Limelight Frame = Java::limelight.ui.model2.Frame Panel = Java::limelight.ui.model2.PropPanel module Painting - TextBoxPainter = Java::limelight.ui.model.painting.TextBoxPainter + TextBoxPainter = Java::limelight.ui.model2.painting.TextBoxPainter ButtonPainter = Java::limelight.ui.model.painting.ButtonPainter CheckBoxPainter = Java::limelight.ui.model.painting.CheckBoxPainter ComboBoxPainter = Java::limelight.ui.model.painting.ComboBoxPainter lib/limelight/java_couplings2.rb @@ -21,6 +21,7 @@ module Limelight end def path_to(path) + #TODO What about windoze? if(path[0] == "/"[0]) return path else lib/limelight/loaders/file_scene_loader.rb @@ -6,9 +6,10 @@ module Limelight module TextBox class << self + def extended(prop) prop.panel.painters.clear - prop.panel.painters << Java.limelight.ui.model.painting.TextBoxPainter.new(prop.panel) + prop.panel.painters << Limelight::UI::Model::Painting::TextBoxPainter.new(prop.panel) prop.panel.clear_event_listeners set_default_styles(prop) end lib/limelight/players/text_box.rb @@ -164,6 +164,10 @@ module Limelight return Pen.new(panel.getGraphics) end + def play_sound(filename) + @panel.play_sound(@scene.loader.path_to(filename)) + end + # GUI Events ########################################## def hover_on lib/limelight/prop.rb @@ -11,5 +11,6 @@ header do example_link :text => "Rounded Corners", :on_mouse_clicked => "scene.load('rounded_corners')" example_link :text => "Floaters", :on_mouse_clicked => "scene.load('floaters')" example_link :text => "Sketching", :on_mouse_clicked => "scene.load('sketching')" + example_link :text => "Sound", :on_mouse_clicked => "scene.load('sounds')" end productions/examples/sandbox/header.rb @@ -9,32 +9,32 @@ arena do cell(:border_width => "1") { input_log :id => "text_box_log" } cell(:border_width => "1") { input_results :id => "text_box_results" } # end row - cell { text_area_input :players => "text_area" } - cell { input_log :id => "text_area_log" } - cell(:border_width => "1") { input_results :id => "text_area_results" } - # end row - cell { check_box_input :players => "check_box" } - cell { input_log :id => "check_box_log" } - cell(:border_width => "1") { input_results :id => "check_box_results" } - # end row - cell do - radio_button_input :players => "radio_button", :id => "radio_1", :group => "radios" - radio_label :text => "One" - radio_button_input :players => "radio_button", :id => "radio_2", :group => "radios" - radio_label :text => "Two" - radio_button_input :players => "radio_button", :id => "radio_3", :group => "radios" - radio_label :text => "Three" - end - cell { input_log :id => "radio_button_log" } - cell(:border_width => "1") { input_results :id => "radio_button_results" } - # end row - cell { combo_box_input :players => "combo_box", :choices => "%w{Red Orange Yellow Green Blue Indigo Violet}" } - cell { input_log :id => "combo_box_log" } - cell(:border_width => "1") { input_results :id => "combo_box_results" } - # end row - cell { button_input :players => "button", :text => "A Button" } - cell { input_log :id => "button_log" } - cell(:border_width => "1") { input_results :id => "button_results" } +# cell { text_area_input :players => "text_area" } +# cell { input_log :id => "text_area_log" } +# cell(:border_width => "1") { input_results :id => "text_area_results" } +# # end row +# cell { check_box_input :players => "check_box" } +# cell { input_log :id => "check_box_log" } +# cell(:border_width => "1") { input_results :id => "check_box_results" } +# # end row +# cell do +# radio_button_input :players => "radio_button", :id => "radio_1", :group => "radios" +# radio_label :text => "One" +# radio_button_input :players => "radio_button", :id => "radio_2", :group => "radios" +# radio_label :text => "Two" +# radio_button_input :players => "radio_button", :id => "radio_3", :group => "radios" +# radio_label :text => "Three" +# end +# cell { input_log :id => "radio_button_log" } +# cell(:border_width => "1") { input_results :id => "radio_button_results" } +# # end row +# cell { combo_box_input :players => "combo_box", :choices => "%w{Red Orange Yellow Green Blue Indigo Violet}" } +# cell { input_log :id => "combo_box_log" } +# cell(:border_width => "1") { input_results :id => "combo_box_results" } +# # end row +# cell { button_input :players => "button", :text => "A Button" } +# cell { input_log :id => "button_log" } +# cell(:border_width => "1") { input_results :id => "button_results" } # end row end end \ No newline at end of file productions/examples/sandbox/inputs/props.rb @@ -211,6 +211,15 @@ describe Limelight::Prop do @prop.children[1].children.length.should == 1 @prop.children[1].children[0].name.should == "three" end + + it "should play sound" do + loader = make_mock("loader") + @scene.loader = loader + loader.should_receive(:path_to).with("some.au").and_return("/full/path/to/some.au"); + @prop.panel.should_receive(:play_sound).with("/full/path/to/some.au"); + + @prop.play_sound("some.au") + end end spec/prop_spec.rb @@ -9,7 +9,7 @@ import limelight.task.TaskEngine; import limelight.ui.Panel; import limelight.ui.model2.FrameManager; import limelight.caching.Cache; - +import javax.sound.sampled.Clip; import java.awt.image.BufferedImage; public class Context @@ -21,6 +21,7 @@ public class Context public TaskEngine taskEngine; public Cache<Panel, BufferedImage> bufferedImageCache; public FrameManager frameManager; + public AudioPlayer audioPlayer; protected Context() { src/limelight/Context.java @@ -6,21 +6,21 @@ package limelight; import limelight.io.Downloader; import limelight.io.FileUtil; import limelight.io.TempDirectory; -import limelight.ui.painting.VerboseRepaintManager; import limelight.ui.Panel; import limelight.ui.model2.FrameManager; import limelight.ui.model2.Frame; import limelight.task.TaskEngine; import limelight.task.RecurringTask; import limelight.caching.TimedCache; +import limelight.audio.RealAudioPlayer; import org.jruby.Ruby; import org.jruby.RubyInstanceConfig; +import javax.sound.sampled.Clip; import java.io.ByteArrayInputStream; import java.io.FileNotFoundException; import java.awt.image.BufferedImage; -import java.util.Iterator; -import java.util.Set; +import java.awt.*; public class Main { @@ -93,6 +93,9 @@ public class Main public void configureContext() { //VerboseRepaintManager.install(); + +// KeyboardFocusManager.setCurrentKeyboardFocusManager(new MyKeyboardFocusManager()); + if(contextIsConfigured) return; Context context = Context.instance(); @@ -101,6 +104,7 @@ public class Main context.taskEngine = new TaskEngine().started(); context.bufferedImageCache = new TimedCache<Panel, BufferedImage>(1); context.frameManager = new FrameManager(); + context.audioPlayer = new RealAudioPlayer(); addBufferedImageCacheCleanerTask(context); addPanelPainterTask(context); @@ -130,4 +134,5 @@ public class Main } }); } + } \ No newline at end of file src/limelight/Main.java @@ -11,6 +11,7 @@ import limelight.task.RecurringTask; import limelight.caching.Cache; import limelight.caching.TimedCache; import limelight.ui.Panel; +import limelight.audio.RealAudioPlayer; import java.awt.image.BufferedImage; @@ -92,4 +93,11 @@ public class MainTest extends TestCase assertEquals(80, ((RecurringTask)task).getPerformancesPerSecond(), 0.01); assertEquals(false, ((RecurringTask)task).isStrict()); } + + public void testAudioPlayerIsAdded() throws Exception + { + main.configureContext(); + + assertEquals(RealAudioPlayer.class, Context.instance().audioPlayer.getClass()); + } } src/limelight/MainTest.java @@ -387,5 +387,10 @@ if("application_list".equals(prop.getName())) super("The panel for prop named '" + name + "' has been sterilized and child components may not be added."); } } + + public void playSound(String filename) + { + Context.instance().audioPlayer.playAuFile(filename); + } } src/limelight/ui/model/Panel.java @@ -21,7 +21,7 @@ public class RadioButtonPainter extends Painter panel.sterilize(); panel.setLayout(new InputLayout()); panel.setTextAccessor(new TextAccessor() { - public void setText(String text) throws LimelightException + public void setText(String text) { radioButton.setText(text); } src/limelight/ui/model/painting/RadioButtonPainter.java @@ -110,13 +110,34 @@ public class EventListener implements MouseListener, MouseMotionListener, MouseW public void keyTyped(KeyEvent e) { + System.err.println("keyTyped"); +// KeyListener[] keyListeners = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner().getKeyListeners(); +// for(int i = 0; i < keyListeners.length; i++) +// { +// KeyListener keyListener = keyListeners[i]; +// keyListener.keyTyped(e); +// } } public void keyPressed(KeyEvent e) { + System.err.println("keyPressed"); +// KeyListener[] keyListeners = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner().getKeyListeners(); +// for(int i = 0; i < keyListeners.length; i++) +// { +// KeyListener keyListener = keyListeners[i]; +// keyListener.keyPressed(e); +// } } public void keyReleased(KeyEvent e) { + System.err.println("keyReleased"); +// KeyListener[] keyListeners = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner().getKeyListeners(); +// for(int i = 0; i < keyListeners.length; i++) +// { +// KeyListener keyListener = keyListeners[i]; +// keyListener.keyReleased(e); +// } } } src/limelight/ui/model2/EventListener.java @@ -20,6 +20,7 @@ public class Frame extends JFrame this.stage = stage; Context.instance().frameManager.watch(this); setIconImage(new ImageIcon(System.getProperty("limelight.home") + "/bin/icon_48.gif").getImage()); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); } public void close() src/limelight/ui/model2/Frame.java @@ -18,7 +18,7 @@ public class FrameManager implements WindowFocusListener, WindowListener public void windowGainedFocus(WindowEvent e) { - Window window = e.getWindow(); + Window window = e.getWindow(); if(window instanceof Frame) { activeFrame = (Frame)window; src/limelight/ui/model2/FrameManager.java @@ -5,6 +5,8 @@ import limelight.ui.api.MockStage; import limelight.ui.MockPanel; import limelight.Context; +import javax.swing.*; + public class FrameTest extends TestCase { private MockStage stage; @@ -59,4 +61,9 @@ public class FrameTest extends TestCase assertEquals(1, frameManager.getFrameCount()); assertEquals(true, frameManager.isWatching(frame)); } + + public void testDefaultCloseOperations() throws Exception + { + assertEquals(WindowConstants.DISPOSE_ON_CLOSE, frame.getDefaultCloseOperation()); + } } src/limelight/ui/model2/FrameTest.java @@ -1,6 +1,7 @@ package limelight.ui.model2; import limelight.LimelightError; +import limelight.Context; import limelight.styles.Style; import limelight.styles.StyleDescriptor; import limelight.styles.StyleObserver; @@ -28,7 +29,7 @@ public class PropPanel extends BasePanel implements PropablePanel, PaintablePane private PropPanelLayout layout; private LinkedList<Painter> painters; private Border borderShaper; - private TextPaneTextAccessor textAccessor; + private TextAccessor textAccessor; private Box boxInsideMargins; private Box boxInsideBorders; private Box boxInsidePadding; @@ -66,12 +67,12 @@ public class PropPanel extends BasePanel implements PropablePanel, PaintablePane textAccessor.setText(text); } - public TextPaneTextAccessor getTextAccessor() + public TextAccessor getTextAccessor() { return textAccessor; } - public void setTextAccessor(TextPaneTextAccessor textAccessor) + public void setTextAccessor(TextAccessor textAccessor) { this.textAccessor = textAccessor; } @@ -354,5 +355,10 @@ public class PropPanel extends BasePanel implements PropablePanel, PaintablePane horizontalScrollBar = null; childConsumableArea = null; } + + public void playSound(String filename) + { + Context.instance().audioPlayer.playAuFile(filename); + } } src/limelight/ui/model2/PropPanel.java @@ -12,6 +12,8 @@ import limelight.ui.painting.Border; import limelight.ui.painting.PaintAction; import limelight.styles.FlatStyle; import limelight.util.Box; +import limelight.Context; +import limelight.audio.MockAudioPlayer; import junit.framework.TestCase; import javax.swing.*; @@ -296,4 +298,14 @@ public class PropPanelTest extends TestCase assertEquals(0, panel.getVerticalScrollBar().getScrollBar().getValue()); assertEquals(16, panel.getHorizontalScrollBar().getScrollBar().getValue()); } + + public void testPlayAudioFile() throws Exception + { + MockAudioPlayer audioPlayer = new MockAudioPlayer(); + Context.instance().audioPlayer = audioPlayer; + + panel.playSound("blah"); + + assertEquals("blah", audioPlayer.playedFile); + } } src/limelight/ui/model2/PropPanelTest.java @@ -16,9 +16,11 @@ public class RootPanel implements Panel private EventListener listener; private boolean alive; private HashSet<Panel> changedPanels; + private Frame frame; public RootPanel(Frame frame) { + this.frame = frame; contentPane = frame.getContentPane(); changedPanels = new HashSet<Panel>(); } @@ -328,4 +330,9 @@ public class RootPanel implements Panel public void add(Panel child) { } + + public Frame getFrame() + { + return frame; + } } src/limelight/ui/model2/RootPanel.java @@ -3,7 +3,6 @@ package limelight.ui.model2; -import limelight.ui.model.TextAccessor; import limelight.LimelightError; public class TextPaneTextAccessor implements TextAccessor src/limelight/ui/model2/TextPaneTextAccessor.java @@ -3,7 +3,7 @@ Build styles from code Build style from props.rb Make text selectable Drop shadows -Allow production styles and stages to be build in production.rb +Allow production styles and stages to be built in production.rb Exit when last stage is closed. (Windows only?) Figure out and implement solution for productions to use gems. Default style? - Not sure how this should work eactly todo.txt b21b14ae3d73fe326f536c67d5b6b545a7ca0abc Micah Martin micah@8thlight.com http://github.com/slagyr/limelight/commit/e9f291237cdee2ac21b6e38daf33c3259881c8b5 e9f291237cdee2ac21b6e38daf33c3259881c8b5 2008-07-21T15:21:08-07:00 2008-07-21T15:21:08-07:00 worked on textbox... took breather and implemented simple sound API 2fb5306f416d6d16d1b00a22b7ad3ee181e30591 Micah Martin micah@8thlight.com