Skip to content

Commit

Permalink
VIX-2759 Clean up a bunch more dead code and unused variables. This g…
Browse files Browse the repository at this point in the history
…ets the compiler warnings down to a dull roar and should be more manageable to see if anything really needs to be addressed going forward.
  • Loading branch information
jeffu231 committed Jun 15, 2019
1 parent 7ea294a commit 7023b6e
Show file tree
Hide file tree
Showing 25 changed files with 17 additions and 291 deletions.
1 change: 0 additions & 1 deletion Application/VixenApplication/CheckForUpdates.cs
Expand Up @@ -153,7 +153,6 @@ private async Task PopulateChangeLog()
}
}

int i = 0;
releaseVersionNames.Reverse();

//We are going to create a list to hold all of our parallel tasks that we spin up
Expand Down

This file was deleted.

46 changes: 0 additions & 46 deletions Application/VixenApplication/Setup/SetupElementsPreview.cs

This file was deleted.

120 changes: 0 additions & 120 deletions Application/VixenApplication/Setup/SetupElementsPreview.resx

This file was deleted.

22 changes: 2 additions & 20 deletions Application/VixenApplication/VixenApplication.cs
Expand Up @@ -50,7 +50,6 @@ public partial class VixenApplication : BaseForm, IApplication
private bool _testBuild;
private string _rootDataDirectory;
private CpuUsage _cpuUsage;
private bool _perfCountersAvailable;
private int _currentBuildVersion;
private string _currentReleaseVersion;

Expand Down Expand Up @@ -283,6 +282,7 @@ internal static bool IsProfileLocked(string path)
}
catch (Exception e)
{
Logging.Error(e, "Error getting the process id to determine lock file removal.");
//No process with that id so release the lock.
RemoveLockFile(lockFilePath);
}
Expand Down Expand Up @@ -1059,30 +1059,12 @@ private void viewInstalledModulesToolStripMenuItem_Click(object sender, EventArg

private const int StatsUpdateInterval = 1000; // ms
private Timer _statsTimer;
private Process _thisProc;
private PerformanceCounter _committedRamCounter;
private PerformanceCounter _reservedRamCounter;


private void InitStats()
{
_thisProc = Process.GetCurrentProcess();
_cpuUsage = new CpuUsage();

//try
//{
// if (PerformanceCounterCategory.Exists(".NET CLR Memory"))
// {
// _committedRamCounter = new PerformanceCounter(".NET CLR Memory", "# Total committed Bytes", _thisProc.ProcessName);
// _reservedRamCounter = new PerformanceCounter(".NET CLR Memory", "# Total reserved Bytes", _thisProc.ProcessName);
// _perfCountersAvailable = true;
// }
//}
//catch (Exception ex)
//{
// Logging.Error("Cannot access performance counters. Refresh the counter list with lodctr /R");
//}

_statsTimer = new Timer();
_statsTimer.Interval = StatsUpdateInterval;
_statsTimer.Tick += statsTimer_Tick;
Expand Down
9 changes: 0 additions & 9 deletions Application/VixenApplication/VixenApplication.csproj
Expand Up @@ -305,12 +305,6 @@
<Compile Include="Setup\SetupControllersSimple.Designer.cs">
<DependentUpon>SetupControllersSimple.cs</DependentUpon>
</Compile>
<Compile Include="Setup\SetupElementsPreview.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Setup\SetupElementsPreview.Designer.cs">
<DependentUpon>SetupElementsPreview.cs</DependentUpon>
</Compile>
<Compile Include="Setup\SetupElementsTree.cs">
<SubType>UserControl</SubType>
</Compile>
Expand Down Expand Up @@ -425,9 +419,6 @@
<EmbeddedResource Include="Setup\SetupControllersSimple.resx">
<DependentUpon>SetupControllersSimple.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Setup\SetupElementsPreview.resx">
<DependentUpon>SetupElementsPreview.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Setup\SetupElementsTree.resx">
<DependentUpon>SetupElementsTree.cs</DependentUpon>
</EmbeddedResource>
Expand Down
5 changes: 2 additions & 3 deletions Common/Controls/Theme/ThemeColorTable.cs
Expand Up @@ -16,8 +16,7 @@ public class ThemeColorTable : ProfessionalColorTable
private static Color _buttonBorderColor = Color.FromArgb(40, 40, 40);
private static Color _buttonBackColor = Color.FromArgb(20, 20, 20);
private static Color _buttonBackColorHover = Color.FromArgb(40, 40, 40);
private static Color _buttonTextColor;


//Text
private static Color _foreColorDisabled = Color.FromArgb(119, 119, 119);

Expand Down Expand Up @@ -86,7 +85,7 @@ public static Color ButtonBackColorHover

public static Color ButtonTextColor
{
get { return _buttonTextColor; }
get { return _foreColor; }
}

//Text
Expand Down
2 changes: 0 additions & 2 deletions Common/Controls/TimeLineControl/Grid.cs
Expand Up @@ -44,7 +44,6 @@ public partial class Grid : TimelineControlBase, IEnumerable<Row>
private Row m_mouseDownElementRow = null;
// the row that the clicked m_mouseDownElement belongs to (a single element may be in multiple rows)

private TimeSpan m_cursorPosition; // the current grid 'cursor' position (line drawn vertically);
private BackgroundWorker renderWorker;
private BlockingCollection<Element> _blockingElementQueue = new BlockingCollection<Element>();
private ManualResetEventSlim renderWorkerFinished;
Expand All @@ -57,7 +56,6 @@ public partial class Grid : TimelineControlBase, IEnumerable<Row>
public bool isColorDrop { get; set; }
public bool isCurveDrop { get; set; }
public bool isGradientDrop { get; set; }
private MouseButtons MouseButtonDown;
public string alignmentHelperWarning = @"Too many effects selected on the same row for this action.\nMax selected effects per row for this action is 4";
public bool aCadStyleSelectionBox { get; set; }

Expand Down
3 changes: 0 additions & 3 deletions Common/Controls/TimeLineControl/Ruler.cs
Expand Up @@ -448,9 +448,6 @@ private enum MouseState

private int m_mouseDownX;
private MouseButtons m_button;
private TimeSpan m_mark;
private Mark _selectedMark = null;
//public SortedDictionary<TimeSpan, SnapDetails> selectedMarks = new SortedDictionary<TimeSpan, SnapDetails>();

protected override void OnMouseDown(MouseEventArgs e)
{
Expand Down
1 change: 0 additions & 1 deletion Modules/Analysis/BeatsAndBars/BeatsAndBars.cs
Expand Up @@ -38,7 +38,6 @@ public BeatsAndBars(Audio module)

private IDictionary<int, ICollection<ManagedFeature>> GenerateFeatures(ManagedPlugin plugin, float[] fSampleData, bool showProgress = true)
{
int i = 0;
int j = 0;
IDictionary<int, ICollection<ManagedFeature>> retVal =
new ConcurrentDictionary<int, ICollection<ManagedFeature>>();
Expand Down
1 change: 0 additions & 1 deletion Modules/App/ColorGradients/ColorGradient.cs
Expand Up @@ -926,7 +926,6 @@ public ColorGradient GetSubGradient(double start, double end)

result.Colors.Add(new ColorPoint(GetColorAt(start), 0));

ColorPoint previous = null;
foreach (ColorPoint cp in Colors)
{
if (cp.Position > start && cp.Position < end)
Expand Down
1 change: 0 additions & 1 deletion Modules/App/CustomPropEditor/CustomPropEditorModule.cs
Expand Up @@ -10,7 +10,6 @@ namespace VixenModules.App.CustomPropEditor
public class CustomPropEditorModule : AppModuleInstanceBase
{
private IApplication _application;
private CustomPropEditorData _data;
private const string MenuIdRoot = "CustomPropRoot";

public override void Loading()
Expand Down
Expand Up @@ -19,8 +19,7 @@ public class DrawingPanelViewModel : ViewModelBase
{
private readonly ElementTreeViewModel _elementTreeViewModel;
private readonly Dictionary<Guid, List<LightViewModel>> _elementModelMap;
private readonly Configuration _config;


public DrawingPanelViewModel(ElementTreeViewModel elementTreeViewModel)
{
_elementTreeViewModel = elementTreeViewModel;
Expand Down
1 change: 1 addition & 0 deletions Modules/App/ExportWizard/BulkExportOutputFormatStage.cs
Expand Up @@ -252,6 +252,7 @@ private bool CanTestPath()
}
catch (Exception e)
{
Logging.Error(e, "Error determining if path can be tested.");
success = false;
}

Expand Down

0 comments on commit 7023b6e

Please sign in to comment.