repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
24d6c86
)
libcectray: delegate method might try to access the controller instance before it...
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 28 Feb 2013 12:42:41 +0000
(13:42 +0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 28 Feb 2013 12:51:15 +0000
(13:51 +0100)
src/LibCecTray/ui/CECTray.cs
patch
|
blob
|
blame
|
history
diff --git
a/src/LibCecTray/ui/CECTray.cs
b/src/LibCecTray/ui/CECTray.cs
index 1ec1b169f6615b7eef0ef3bec87117b2bc55b08e..6703e5f8d76e6a9a22c825678bf7b7ccb0a4fcd8 100644
(file)
--- a/
src/LibCecTray/ui/CECTray.cs
+++ b/
src/LibCecTray/ui/CECTray.cs
@@
-63,7
+63,6
@@
namespace LibCECTray.ui
{
Text = Resources.app_name;
InitializeComponent();
{
Text = Resources.app_name;
InitializeComponent();
- _controller = new CECController(this);
VisibleChanged += delegate
{
if (!Visible)
VisibleChanged += delegate
{
if (!Visible)
@@
-81,7
+80,7
@@
namespace LibCECTray.ui
private void CECTrayLoad(object sender, EventArgs e)
{
private void CECTrayLoad(object sender, EventArgs e)
{
-
_c
ontroller.Initialise();
+
C
ontroller.Initialise();
}
protected override void Dispose(bool disposing)
}
protected override void Dispose(bool disposing)
@@
-89,7
+88,7
@@
namespace LibCECTray.ui
Hide();
if (disposing)
{
Hide();
if (disposing)
{
-
_c
ontroller.Close();
+
C
ontroller.Close();
}
if (disposing && (components != null))
{
}
if (disposing && (components != null))
{
@@
-120,12
+119,12
@@
namespace LibCECTray.ui
private void BSaveClick(object sender, EventArgs e)
{
private void BSaveClick(object sender, EventArgs e)
{
-
_c
ontroller.PersistSettings();
+
C
ontroller.PersistSettings();
}
private void BReloadConfigClick(object sender, EventArgs e)
{
}
private void BReloadConfigClick(object sender, EventArgs e)
{
-
_c
ontroller.ResetDefaultSettings();
+
C
ontroller.ResetDefaultSettings();
}
#endregion
}
#endregion
@@
-170,22
+169,22
@@
namespace LibCECTray.ui
private void BSendImageViewOnClick(object sender, EventArgs e)
{
private void BSendImageViewOnClick(object sender, EventArgs e)
{
-
_c
ontroller.CECActions.SendImageViewOn(GetTargetDevice());
+
C
ontroller.CECActions.SendImageViewOn(GetTargetDevice());
}
private void BStandbyClick(object sender, EventArgs e)
{
}
private void BStandbyClick(object sender, EventArgs e)
{
-
_c
ontroller.CECActions.SendStandby(GetTargetDevice());
+
C
ontroller.CECActions.SendStandby(GetTargetDevice());
}
private void BScanClick(object sender, EventArgs e)
{
}
private void BScanClick(object sender, EventArgs e)
{
-
_c
ontroller.CECActions.ShowDeviceInfo(GetTargetDevice());
+
C
ontroller.CECActions.ShowDeviceInfo(GetTargetDevice());
}
private void BActivateSourceClick(object sender, EventArgs e)
{
}
private void BActivateSourceClick(object sender, EventArgs e)
{
-
_c
ontroller.CECActions.ActivateSource(GetTargetDevice());
+
C
ontroller.CECActions.ActivateSource(GetTargetDevice());
}
private void CbCommandDestinationSelectedIndexChanged(object sender, EventArgs e)
}
private void CbCommandDestinationSelectedIndexChanged(object sender, EventArgs e)
@@
-200,22
+199,22
@@
namespace LibCECTray.ui
private void BVolUpClick(object sender, EventArgs e)
{
private void BVolUpClick(object sender, EventArgs e)
{
-
_c
ontroller.Lib.VolumeUp(true);
+
C
ontroller.Lib.VolumeUp(true);
}
private void BVolDownClick(object sender, EventArgs e)
{
}
private void BVolDownClick(object sender, EventArgs e)
{
-
_c
ontroller.Lib.VolumeDown(true);
+
C
ontroller.Lib.VolumeDown(true);
}
private void BMuteClick(object sender, EventArgs e)
{
}
private void BMuteClick(object sender, EventArgs e)
{
-
_c
ontroller.Lib.MuteAudio(true);
+
C
ontroller.Lib.MuteAudio(true);
}
private void BRescanDevicesClick(object sender, EventArgs e)
{
}
private void BRescanDevicesClick(object sender, EventArgs e)
{
-
_c
ontroller.CECActions.RescanDevices();
+
C
ontroller.CECActions.RescanDevices();
}
#endregion
}
#endregion
@@
-333,12
+332,12
@@
namespace LibCECTray.ui
private void AboutToolStripMenuItemClick(object sender, EventArgs e)
{
private void AboutToolStripMenuItemClick(object sender, EventArgs e)
{
- (new About(
_controller.LibServerVersion, _controller.LibClientVersion, _c
ontroller.LibInfo)).ShowDialog();
+ (new About(
Controller.LibServerVersion, Controller.LibClientVersion, C
ontroller.LibInfo)).ShowDialog();
}
private void AdvancedModeToolStripMenuItemClick(object sender, EventArgs e)
{
}
private void AdvancedModeToolStripMenuItemClick(object sender, EventArgs e)
{
-
_c
ontroller.Settings.AdvancedMode.Value = !advancedModeToolStripMenuItem.Checked;
+
C
ontroller.Settings.AdvancedMode.Value = !advancedModeToolStripMenuItem.Checked;
ShowHideAdvanced(!advancedModeToolStripMenuItem.Checked);
}
ShowHideAdvanced(!advancedModeToolStripMenuItem.Checked);
}
@@
-372,12
+371,12
@@
namespace LibCECTray.ui
{
if (Visible && WindowState != FormWindowState.Minimized)
{
{
if (Visible && WindowState != FormWindowState.Minimized)
{
-
_c
ontroller.Settings.StartHidden.Value = true;
+
C
ontroller.Settings.StartHidden.Value = true;
Hide();
}
else
{
Hide();
}
else
{
-
_c
ontroller.Settings.StartHidden.Value = false;
+
C
ontroller.Settings.StartHidden.Value = false;
Show();
}
}
Show();
}
}
@@
-426,7
+425,7
@@
namespace LibCECTray.ui
private void TsAdvancedClick(object sender, EventArgs e)
{
private void TsAdvancedClick(object sender, EventArgs e)
{
-
_c
ontroller.Settings.AdvancedMode.Value = !tsAdvanced.Checked;
+
C
ontroller.Settings.AdvancedMode.Value = !tsAdvanced.Checked;
ShowHideAdvanced(!tsAdvanced.Checked);
}
ShowHideAdvanced(!tsAdvanced.Checked);
}
@@
-482,10
+481,10
@@
namespace LibCECTray.ui
#region Class members
private ConfigTab _selectedTab = ConfigTab.Configuration;
private string _log = string.Empty;
#region Class members
private ConfigTab _selectedTab = ConfigTab.Configuration;
private string _log = string.Empty;
- private
readonly
CECController _controller;
+ private CECController _controller;
public CECController Controller
{
public CECController Controller
{
- get { return _controller; }
+ get { return _controller
?? (_controller = new CECController(this))
; }
}
public Control.ControlCollection TabControls
{
}
public Control.ControlCollection TabControls
{
@@
-499,8
+498,8
@@
namespace LibCECTray.ui
private void AddNewApplicationToolStripMenuItemClick(object sender, EventArgs e)
{
private void AddNewApplicationToolStripMenuItemClick(object sender, EventArgs e)
{
- ConfigureApplication appConfig = new ConfigureApplication(
_controller.Settings, _c
ontroller);
-
_c
ontroller.DisplayDialog(appConfig, false);
+ ConfigureApplication appConfig = new ConfigureApplication(
Controller.Settings, C
ontroller);
+
C
ontroller.DisplayDialog(appConfig, false);
}
}
}
}
}
}