Little Tweaks
This commit is contained in:
1 parent
78870ae26d
commit
d5cb43a09f
11 files changed
+87
-44
No files matched your search
@@ -284,7 +284,10 @@ namespace Vocaluxe.Base
|
||||
public static bool SaveConfig()
|
||||
{
|
||||
|
||||
XmlWriter writer = XmlWriter.Create(CSettings.sFileConfig, _settings);
|
||||
XmlWriter writer = null;
|
||||
try
|
||||
{
|
||||
writer = XmlWriter.Create(CSettings.sFileConfig, _settings);
|
||||
writer.WriteStartDocument();
|
||||
writer.WriteStartElement("root");
|
||||
|
||||
@@ -545,9 +548,15 @@ namespace Vocaluxe.Base
|
||||
// End of File
|
||||
writer.WriteEndElement(); //end of root
|
||||
writer.WriteEndDocument();
|
||||
|
||||
writer.Flush();
|
||||
writer.Close();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
writer = null;
|
||||
return false;
|
||||
}
|
||||
writer = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -1439,9 +1439,9 @@ namespace Vocaluxe.Base
|
||||
if (File.Exists(ImagePath))
|
||||
{
|
||||
|
||||
SQLiteConnection connection = new SQLiteConnection();
|
||||
using (SQLiteConnection connection = new SQLiteConnection())
|
||||
{
|
||||
connection.ConnectionString = "Data Source=" + _CreditsRessourcesFilePath;
|
||||
SQLiteCommand command;
|
||||
try
|
||||
{
|
||||
connection.Open();
|
||||
@@ -1450,12 +1450,8 @@ namespace Vocaluxe.Base
|
||||
{
|
||||
return false;
|
||||
}
|
||||
command = new SQLiteCommand(connection);
|
||||
|
||||
SQLiteDataReader reader = null;
|
||||
|
||||
if (reader != null)
|
||||
reader.Close();
|
||||
using (SQLiteCommand command = new SQLiteCommand(connection))
|
||||
{
|
||||
|
||||
Bitmap origin;
|
||||
try
|
||||
@@ -1467,14 +1463,7 @@ namespace Vocaluxe.Base
|
||||
CLog.LogError("Error loading Texture: " + ImagePath);
|
||||
tex = new STexture(-1);
|
||||
|
||||
if (reader != null)
|
||||
{
|
||||
reader.Close();
|
||||
reader.Dispose();
|
||||
}
|
||||
command.Dispose();
|
||||
connection.Close();
|
||||
connection.Dispose();
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -1486,7 +1475,6 @@ namespace Vocaluxe.Base
|
||||
Graphics g = Graphics.FromImage(bmp);
|
||||
g.DrawImage(origin, new Rectangle(0, 0, w, h));
|
||||
g.Dispose();
|
||||
if (origin != null)
|
||||
origin.Dispose();
|
||||
tex = CDraw.AddTexture(bmp);
|
||||
byte[] data = new byte[w * h * 4];
|
||||
@@ -1503,7 +1491,7 @@ namespace Vocaluxe.Base
|
||||
|
||||
command.CommandText = "SELECT id FROM Images WHERE [Path] = @path";
|
||||
command.Parameters.Add("@path", System.Data.DbType.String, 0).Value = Path.GetFileName(ImagePath);
|
||||
reader = null;
|
||||
SQLiteDataReader reader = null;
|
||||
try
|
||||
{
|
||||
reader = command.ExecuteReader();
|
||||
@@ -1525,6 +1513,8 @@ namespace Vocaluxe.Base
|
||||
result = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
+12
-2
@@ -135,11 +135,11 @@ namespace Vocaluxe.Base
|
||||
}
|
||||
}
|
||||
|
||||
class CFont
|
||||
class CFont:IDisposable
|
||||
{
|
||||
private List<CGlyph> _Glyphs;
|
||||
private Hashtable _htGlyphs;
|
||||
private PrivateFontCollection fonts;
|
||||
private PrivateFontCollection fonts = null;
|
||||
private FontFamily family;
|
||||
private float SIZEh;
|
||||
|
||||
@@ -268,6 +268,16 @@ namespace Vocaluxe.Base
|
||||
}
|
||||
_Glyphs.Clear();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (fonts != null)
|
||||
{
|
||||
fonts.Dispose();
|
||||
fonts = null;
|
||||
}
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
|
||||
struct SFont
|
||||
|
||||
+12
-2
@@ -6,11 +6,11 @@ using System.Text;
|
||||
|
||||
namespace Vocaluxe.Base
|
||||
{
|
||||
class Log
|
||||
class Log:IDisposable
|
||||
{
|
||||
private string _LogFileName;
|
||||
private string _LogName;
|
||||
private StreamWriter _LogFile;
|
||||
private StreamWriter _LogFile = null;
|
||||
|
||||
public Log(string FileName, string LogName)
|
||||
{
|
||||
@@ -56,6 +56,16 @@ namespace Vocaluxe.Base
|
||||
_LogFile.WriteLine("----------------------------------------");
|
||||
_LogFile.WriteLine();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (_LogFile != null)
|
||||
{
|
||||
_LogFile.Dispose();
|
||||
_LogFile = null;
|
||||
}
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
|
||||
static class CLog
|
||||
|
||||
+1
-13
@@ -605,23 +605,11 @@ namespace Vocaluxe.Base
|
||||
|
||||
public CSong GetVisibleSong(int VisibleIndex)
|
||||
{
|
||||
if (VisibleIndex >= CSongs.NumVisibleSongs)
|
||||
return null;
|
||||
|
||||
CSong song = CSongs.VisibleSongs[VisibleIndex];
|
||||
//Flamefire: Why copy the song-instance??? Cover and stuff will be loaded twice!
|
||||
//And for unknown reason causes no-big-cover bug if covers are not loaded on startup
|
||||
return song;
|
||||
//if (song == null)
|
||||
// return null;
|
||||
|
||||
//return new CSong(song);
|
||||
return CSongs.GetVisibleSongByIndex(VisibleIndex);
|
||||
}
|
||||
|
||||
public CSong GetSongByID(int SongID)
|
||||
{
|
||||
//Flamefire: Why copy?
|
||||
//return new CSong(CSongs.GetSong(SongID));
|
||||
return CSongs.GetSong(SongID);
|
||||
}
|
||||
|
||||
|
||||
@@ -381,6 +381,23 @@ namespace Vocaluxe.Base
|
||||
get { return _Categories.ToArray(); }
|
||||
}
|
||||
|
||||
public static CSong GetVisibleSongByIndex(int index)
|
||||
{
|
||||
if (index < 0)
|
||||
return null;
|
||||
|
||||
foreach (SongPointer sp in _SongsSortList)
|
||||
{
|
||||
if (sp.Visible)
|
||||
{
|
||||
if (index == 0)
|
||||
return _Songs[sp.SongID];
|
||||
index--;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static void _FilterSongs(String SearchFilter, bool ShowDuetSongs)
|
||||
{
|
||||
if (_Init && _SearchFilter == SearchFilter && _ShowDuetSongs == ShowDuetSongs)
|
||||
|
||||
+12
-2
@@ -300,7 +300,7 @@ namespace Vocaluxe.Base
|
||||
#endregion Record
|
||||
}
|
||||
|
||||
class CBuffer
|
||||
class CBuffer : IDisposable
|
||||
{
|
||||
private const double _BaseToneFreq = 65.4064;
|
||||
private const int _NumHalfTones = 47;
|
||||
@@ -315,7 +315,7 @@ namespace Vocaluxe.Base
|
||||
private double _MaxVolume = 0.0;
|
||||
private bool _NewSamples;
|
||||
|
||||
private MemoryStream _Stream; // full buffer
|
||||
private MemoryStream _Stream = null; // full buffer
|
||||
|
||||
public CBuffer()
|
||||
{
|
||||
@@ -554,6 +554,16 @@ namespace Vocaluxe.Base
|
||||
|
||||
return 1 - AccumDist / _AnalysisBuffer.Length;
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (_Stream != null)
|
||||
{
|
||||
_Stream.Dispose();
|
||||
_Stream = null;
|
||||
}
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
|
||||
class CSyncTimer
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using Vocaluxe.Base;
|
||||
using Vocaluxe.Menu;
|
||||
|
||||
@@ -11,9 +11,9 @@ using Vocaluxe.Menu;
|
||||
|
||||
namespace Vocaluxe.Lib.Input.WiiMote
|
||||
{
|
||||
class CWiiMote : IInput
|
||||
class CWiiMote : IInput, IDisposable
|
||||
{
|
||||
WiiMoteLib _WiiMote;
|
||||
WiiMoteLib _WiiMote = null;
|
||||
|
||||
private List<KeyEvent> _KeysPool;
|
||||
private List<KeyEvent> _CurrentKeysPool;
|
||||
@@ -324,5 +324,15 @@ namespace Vocaluxe.Lib.Input.WiiMote
|
||||
_MousePool.Clear();
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (_WiiMote != null)
|
||||
{
|
||||
_WiiMote.Dispose();
|
||||
_WiiMote = null;
|
||||
}
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -104,7 +104,7 @@ namespace Vocaluxe.Lib.Video.Acinerella
|
||||
public struct TAc_decoder
|
||||
{
|
||||
//Pointer on the Acinerella instance
|
||||
public IntPtr pAcInstance;
|
||||
private IntPtr pAcInstance;
|
||||
//Contains the type of the decoder.
|
||||
public TAc_decoder_type dec_type;
|
||||
|
||||
|
||||
@@ -229,6 +229,7 @@
|
||||
<Compile Include="Program.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Screens\CPopupScreenPlayerControl.cs" />
|
||||
<Compile Include="Screens\CPopupScreenVolumeControl.cs" />
|
||||
<Compile Include="Screens\CScreenCredits.cs" />
|
||||
|
||||
Reference in new issue
Block a user