mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
Added fields to HyperCon for the 3D and screensaver check
Former-commit-id: a84a516c9fce8a56381fcf31852573d041699c4e
This commit is contained in:
johan
parent
f598f6e417
commit
efcb8ec179
@ -383,12 +383,14 @@
|
||||
},
|
||||
|
||||
/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields:
|
||||
/// * xbmcAddress : The IP address of the XBMC-host
|
||||
/// * xbmcTcpPort : The TCP-port of the XBMC-server
|
||||
/// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback
|
||||
/// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
|
||||
/// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback
|
||||
/// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu
|
||||
/// * xbmcAddress : The IP address of the XBMC-host
|
||||
/// * xbmcTcpPort : The TCP-port of the XBMC-server
|
||||
/// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback
|
||||
/// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
|
||||
/// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback
|
||||
/// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu
|
||||
/// * grabScreensaver : Flag indicating that the frame-grabber is on(true) when XBMC is on screensaver
|
||||
/// * enable3DDetection : Flag indicating that the frame-grabber should switch to a 3D compatible modus if a 3D video is playing
|
||||
"xbmcVideoChecker" :
|
||||
{
|
||||
"xbmcAddress" : "127.0.0.1",
|
||||
@ -396,7 +398,9 @@
|
||||
"grabVideo" : true,
|
||||
"grabPictures" : true,
|
||||
"grabAudio" : true,
|
||||
"grabMenu" : false
|
||||
"grabMenu" : false,
|
||||
"grabScreensaver" : true,
|
||||
"enable3DDetection" : true
|
||||
},
|
||||
|
||||
/// The configuration of the Json server which enables the json remote interface
|
||||
|
||||
@ -144,6 +144,206 @@
|
||||
"index" : 9,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 10,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
|
||||
},
|
||||
{
|
||||
"index" : 11,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
|
||||
},
|
||||
{
|
||||
"index" : 12,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
|
||||
},
|
||||
{
|
||||
"index" : 13,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
|
||||
},
|
||||
{
|
||||
"index" : 14,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
|
||||
},
|
||||
{
|
||||
"index" : 15,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
|
||||
},
|
||||
{
|
||||
"index" : 16,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 17,
|
||||
"hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 18,
|
||||
"hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 19,
|
||||
"hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 20,
|
||||
"hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 21,
|
||||
"hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 22,
|
||||
"hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 23,
|
||||
"hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 24,
|
||||
"hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 25,
|
||||
"hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 26,
|
||||
"hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 27,
|
||||
"hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 28,
|
||||
"hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 29,
|
||||
"hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 30,
|
||||
"hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 31,
|
||||
"hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 32,
|
||||
"hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 33,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
|
||||
},
|
||||
{
|
||||
"index" : 34,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
|
||||
},
|
||||
{
|
||||
"index" : 35,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
|
||||
},
|
||||
{
|
||||
"index" : 36,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
|
||||
},
|
||||
{
|
||||
"index" : 37,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
|
||||
},
|
||||
{
|
||||
"index" : 38,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
|
||||
},
|
||||
{
|
||||
"index" : 39,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
|
||||
},
|
||||
{
|
||||
"index" : 40,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 41,
|
||||
"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 42,
|
||||
"hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 43,
|
||||
"hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 44,
|
||||
"hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 45,
|
||||
"hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 46,
|
||||
"hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 47,
|
||||
"hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 48,
|
||||
"hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
},
|
||||
{
|
||||
"index" : 49,
|
||||
"hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
|
||||
"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
|
||||
}
|
||||
],
|
||||
|
||||
@ -171,34 +371,6 @@
|
||||
"duration_ms" : 3000
|
||||
},
|
||||
|
||||
/// The configuration for the frame-grabber, contains the following items:
|
||||
/// * width : The width of the grabbed frames [pixels]
|
||||
/// * height : The height of the grabbed frames [pixels]
|
||||
/// * frequency_Hz : The frequency of the frame grab [Hz]
|
||||
// "framegrabber" :
|
||||
// {
|
||||
// "width" : 64,
|
||||
// "height" : 64,
|
||||
// "frequency_Hz" : 10.0
|
||||
// },
|
||||
|
||||
/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields:
|
||||
/// * xbmcAddress : The IP address of the XBMC-host
|
||||
/// * xbmcTcpPort : The TCP-port of the XBMC-server
|
||||
/// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback
|
||||
/// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
|
||||
/// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback
|
||||
/// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu
|
||||
"xbmcVideoChecker" :
|
||||
{
|
||||
"xbmcAddress" : "127.0.0.1",
|
||||
"xbmcTcpPort" : 9090,
|
||||
"grabVideo" : true,
|
||||
"grabPictures" : true,
|
||||
"grabAudio" : true,
|
||||
"grabMenu" : false
|
||||
},
|
||||
|
||||
/// The configuration of the Json server which enables the json remote interface
|
||||
/// * port : Port at which the json server is started
|
||||
"jsonServer" :
|
||||
|
||||
@ -1 +1 @@
|
||||
bfe21c488f982bc107e7acaa4c90be41a6782f9e
|
||||
0074a4390b1d8d0c87488a3e7a13ec372786d140
|
||||
@ -1 +1 @@
|
||||
c0e8e51a825f30e490de8971fef3a31bff1df67a
|
||||
a975349d4d5b010597f15b5efa6363f43434627f
|
||||
@ -41,6 +41,10 @@ public class XbmcPanel extends JPanel {
|
||||
private JComboBox<String> mPictureCombo;
|
||||
private JLabel mAudioLabel;
|
||||
private JComboBox<String> mAudioCombo;
|
||||
private JLabel mScreensaverLabel;
|
||||
private JComboBox<String> mScreensaverCombo;
|
||||
private JLabel mEnable3DLabel;
|
||||
private JComboBox<String> mEnable3DCombo;
|
||||
|
||||
public XbmcPanel(final MiscConfig pMiscConfig) {
|
||||
super();
|
||||
@ -130,6 +134,24 @@ public class XbmcPanel extends JPanel {
|
||||
mAudioCombo.addActionListener(mActionListener);
|
||||
add(mAudioCombo);
|
||||
|
||||
mScreensaverLabel = new JLabel("Screensaver");
|
||||
add(mScreensaverLabel);
|
||||
|
||||
mScreensaverCombo = new JComboBox<>(new String[] {"On", "Off"});
|
||||
mScreensaverCombo.setSelectedItem(mMiscConfig.mScreensaverOn? "On": "Off");
|
||||
mScreensaverCombo.setToolTipText("Enables('On') or disables('Off') the ambi-light when the XBMC screensaver is active");
|
||||
mScreensaverCombo.addActionListener(mActionListener);
|
||||
add(mScreensaverCombo);
|
||||
|
||||
mEnable3DLabel = new JLabel("3D checking");
|
||||
add(mEnable3DLabel);
|
||||
|
||||
mEnable3DCombo = new JComboBox<>(new String[] {"On", "Off"});
|
||||
mEnable3DCombo.setSelectedItem(mMiscConfig.m3DCheckingEnabled ? "On": "Off");
|
||||
mEnable3DCombo.setToolTipText("Enables('On') or disables('Off') switching to 3D mode when a 3D video file is started");
|
||||
mEnable3DCombo.addActionListener(mActionListener);
|
||||
add(mEnable3DCombo);
|
||||
|
||||
GroupLayout layout = new GroupLayout(this);
|
||||
layout.setAutoCreateGaps(true);
|
||||
setLayout(layout);
|
||||
@ -143,6 +165,8 @@ public class XbmcPanel extends JPanel {
|
||||
.addComponent(mVideoLabel)
|
||||
.addComponent(mPictureLabel)
|
||||
.addComponent(mAudioLabel)
|
||||
.addComponent(mScreensaverLabel)
|
||||
.addComponent(mEnable3DLabel)
|
||||
)
|
||||
.addGroup(layout.createParallelGroup()
|
||||
.addComponent(mXbmcCheck)
|
||||
@ -152,6 +176,8 @@ public class XbmcPanel extends JPanel {
|
||||
.addComponent(mVideoCombo)
|
||||
.addComponent(mPictureCombo)
|
||||
.addComponent(mAudioCombo)
|
||||
.addComponent(mScreensaverCombo)
|
||||
.addComponent(mEnable3DCombo)
|
||||
));
|
||||
layout.setVerticalGroup(layout.createSequentialGroup()
|
||||
.addComponent(mXbmcCheck)
|
||||
@ -178,6 +204,14 @@ public class XbmcPanel extends JPanel {
|
||||
.addGroup(layout.createParallelGroup()
|
||||
.addComponent(mAudioLabel)
|
||||
.addComponent(mAudioCombo)
|
||||
)
|
||||
.addGroup(layout.createParallelGroup()
|
||||
.addComponent(mScreensaverLabel)
|
||||
.addComponent(mScreensaverCombo)
|
||||
)
|
||||
.addGroup(layout.createParallelGroup()
|
||||
.addComponent(mEnable3DLabel)
|
||||
.addComponent(mEnable3DCombo)
|
||||
));
|
||||
|
||||
toggleEnabled(mMiscConfig.mXbmcCheckerEnabled);
|
||||
@ -198,6 +232,10 @@ public class XbmcPanel extends JPanel {
|
||||
mPictureCombo.setEnabled(pEnabled);
|
||||
mAudioLabel.setEnabled(pEnabled);
|
||||
mAudioCombo.setEnabled(pEnabled);
|
||||
mScreensaverLabel.setEnabled(pEnabled);
|
||||
mScreensaverCombo.setEnabled(pEnabled);
|
||||
mEnable3DLabel.setEnabled(pEnabled);
|
||||
mEnable3DCombo.setEnabled(pEnabled);
|
||||
}
|
||||
|
||||
private final ChangeListener mChangeListener = new ChangeListener() {
|
||||
@ -216,6 +254,8 @@ public class XbmcPanel extends JPanel {
|
||||
mMiscConfig.mVideoOn = (mVideoCombo.getSelectedItem() == "On");
|
||||
mMiscConfig.mPictureOn = (mPictureCombo.getSelectedItem() == "On");
|
||||
mMiscConfig.mAudioOn = (mAudioCombo.getSelectedItem() == "On");
|
||||
mMiscConfig.mScreensaverOn = (mScreensaverCombo.getSelectedItem() == "On");
|
||||
mMiscConfig.m3DCheckingEnabled = (mEnable3DCombo.getSelectedItem() == "On");
|
||||
|
||||
toggleEnabled(mMiscConfig.mXbmcCheckerEnabled);
|
||||
}
|
||||
|
||||
@ -40,6 +40,10 @@ public class MiscConfig {
|
||||
public boolean mPictureOn = true;
|
||||
/** Flag indicating that the frame-grabber is on during audio playback */
|
||||
public boolean mAudioOn = true;
|
||||
/** Flag indicating that the frame-grabber is on when xbmc is on screensaver */
|
||||
public boolean mScreensaverOn = true;
|
||||
/** Flag indicating that the frame-grabber is should take actions when a 3D file is playing */
|
||||
public boolean m3DCheckingEnabled = true;
|
||||
|
||||
/** Flag indicating that the JSON interface is enabled */
|
||||
public boolean mJsonInterfaceEnabled = true;
|
||||
@ -103,12 +107,14 @@ public class MiscConfig {
|
||||
|
||||
String xbmcComment =
|
||||
"The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: \n" +
|
||||
" * xbmcAddress : The IP address of the XBMC-host\n" +
|
||||
" * xbmcTcpPort : The TCP-port of the XBMC-server\n" +
|
||||
" * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback\n" +
|
||||
" * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show\n" +
|
||||
" * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback\n" +
|
||||
" * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu\n";
|
||||
" * xbmcAddress : The IP address of the XBMC-host\n" +
|
||||
" * xbmcTcpPort : The TCP-port of the XBMC-server\n" +
|
||||
" * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback\n" +
|
||||
" * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show\n" +
|
||||
" * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback\n" +
|
||||
" * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu\n" +
|
||||
" * grabScreensaver : Flag indicating that the frame-grabber is on(true) when XBMC is on screensaver\n" +
|
||||
" * enable3DDetection : Flag indicating that the frame-grabber should switch to a 3D compatible modus if a 3D video is playing\n";
|
||||
strBuf.writeComment(xbmcComment);
|
||||
|
||||
strBuf.toggleComment(!mXbmcCheckerEnabled);
|
||||
@ -118,7 +124,9 @@ public class MiscConfig {
|
||||
strBuf.addValue("grabVideo", mVideoOn, false);
|
||||
strBuf.addValue("grabPictures", mPictureOn, false);
|
||||
strBuf.addValue("grabAudio", mAudioOn, false);
|
||||
strBuf.addValue("grabMenu", mMenuOn, true);
|
||||
strBuf.addValue("grabMenu", mMenuOn, false);
|
||||
strBuf.addValue("grabScreensaver", mScreensaverOn, false);
|
||||
strBuf.addValue("enable3DDetection", m3DCheckingEnabled, true);
|
||||
strBuf.stopObject();
|
||||
strBuf.toggleComment(false);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user