Browse files

fix output mapping panel

  • Loading branch information...
1 parent 036546a commit 44c1516a7dde2346f728ddc881d5b4bf70e42111 @neophob committed Apr 11, 2012
Showing with 9 additions and 8 deletions.
  1. +2 −2 data/config.properties
  2. +7 −6 src/main/java/com/neophob/sematrix/output/gui/GeneratorGui.java
View
4 data/config.properties
@@ -113,14 +113,14 @@ panel.color.order=RGB,RBG
# ROTATE_180_FLIPPEDY,
# ROTATE_270,
#=========================
-pixelinvaders.layout.row1=NO_ROTATE
+#pixelinvaders.layout.row1=NO_ROTATE
#pixelinvaders.layout.row1=ROTATE_180,NO_ROTATE
#pixelinvaders.layout.row2=NO_ROTATE,NO_ROTATE
#=========================
#settings for null output
#=========================
-#nulloutput.devices.row1=2
+nulloutput.devices.row1=2
#nulloutput.devices.row2=0
#=========================
View
13 src/main/java/com/neophob/sematrix/output/gui/GeneratorGui.java
@@ -576,13 +576,14 @@ public Collector callbackRefreshMini() {
mixerList.setLabel(mixerList.getItem(v.getMixerIdx()).getName());
}
- //TODO NEXT
- return col;
//get output status
- // OutputMapping om = ioMapping.get(currentOutput);
- // ret.add(ValidCommands.CHANGE_OUTPUT_EFFECT+EMPTY_CHAR+om.getEffect().getId());
- // ret.add(ValidCommands.CHANGE_OUTPUT_FADER+EMPTY_CHAR+om.getFader().getId());
- // ret.add(ValidCommands.CHANGE_OUTPUT_VISUAL+EMPTY_CHAR+om.getVisualId());
+ OutputMapping om = col.getOutputMappings(col.getCurrentOutput());
+ dropdownOutputVisual.setLabel(dropdownOutputVisual.getItem(om.getVisualId()).getName());
+ dropdownOutputEffect.setLabel(dropdownOutputEffect.getItem(om.getEffect().getId()).getName());
+ dropdownOutputFader.setLabel(dropdownOutputFader.getItem(om.getFader().getId()).getName());
+
+ return col;
+
}
/**

0 comments on commit 44c1516

Please sign in to comment.