Skip to content

Commit

Permalink
Windows: Commented/removed much of the code in all forms. It will be …
Browse files Browse the repository at this point in the history 
…easier later to restore the older code that might still be useful (UI-related code).

Related to issue #422.
  • Loading branch information
@ycastonguay
ycastonguay committed Jul 11, 2013
1 parent 3fd6c5a commit d9eb511
Show file tree
Hide file tree
Showing 9 changed files with 3,414 additions and 3,566 deletions.
432 changes: 216 additions & 216 deletions MPfm/MPfm.Windows/Classes/Forms/frmAddEditLoop.cs
View file

Large diffs are not rendered by default.

312 changes: 156 additions & 156 deletions MPfm/MPfm.Windows/Classes/Forms/frmAddEditMarker.cs
View file
Expand Up @@ -68,42 +68,42 @@ public frmAddEditMarker(frmMain main, AddEditMarkerWindowMode mode, AudioFile au
/// </summary>
private void Initialize()
{
// Set song labels
lblArtistNameValue.Text = audioFile.ArtistName;
lblAlbumTitleValue.Text = audioFile.AlbumTitle;
lblSongTitleValue.Text = audioFile.Title;

// Set labels depending on mode
if (mode == AddEditMarkerWindowMode.Add)
{
panelEditMarker.HeaderTitle = "Add Marker";
Text = "Add Marker";
}
else if (mode == AddEditMarkerWindowMode.Edit)
{
panelEditMarker.HeaderTitle = "Edit Marker";
panelEditMarker.Refresh();
Text = "Edit Marker";

// Fetch marker from database
Marker marker = Main.Library.Facade.SelectMarker(markerId);

// Check if the marker was found
if(marker == null)
{
return;
}

// Update fields
txtName.Text = marker.Name;
txtComments.Text = marker.Comments;
txtPosition.Text = marker.Position;
lblMarkerPositionSamplesValue.Text = marker.PositionSamples.ToString();
lblMarkerPositionBytesValue.Text = marker.PositionBytes.ToString();
}

// Validate form
ValidateForm();
//// Set song labels
//lblArtistNameValue.Text = audioFile.ArtistName;
//lblAlbumTitleValue.Text = audioFile.AlbumTitle;
//lblSongTitleValue.Text = audioFile.Title;

//// Set labels depending on mode
//if (mode == AddEditMarkerWindowMode.Add)
//{
// panelEditMarker.HeaderTitle = "Add Marker";
// Text = "Add Marker";
//}
//else if (mode == AddEditMarkerWindowMode.Edit)
//{
// panelEditMarker.HeaderTitle = "Edit Marker";
// panelEditMarker.Refresh();
// Text = "Edit Marker";

// // Fetch marker from database
// Marker marker = Main.Library.Facade.SelectMarker(markerId);

// // Check if the marker was found
// if(marker == null)
// {
// return;
// }

// // Update fields
// txtName.Text = marker.Name;
// txtComments.Text = marker.Comments;
// txtPosition.Text = marker.Position;
// lblMarkerPositionSamplesValue.Text = marker.PositionSamples.ToString();
// lblMarkerPositionBytesValue.Text = marker.PositionBytes.ToString();
//}

//// Validate form
//ValidateForm();
}

/// <summary>
Expand All @@ -116,60 +116,61 @@ private void btnClose_Click(object sender, EventArgs e)
// Hide the form
this.Close();
}

/// <summary>
/// Occurs when the user clicks on the "Save" button.
/// </summary>
/// <param name="sender">Event sender</param>
/// <param name="e">Event arguments</param>
private void btnSave_Click(object sender, EventArgs e)
{
// Get PCM and PCM bytes values
long pcm = 0;
long.TryParse(lblMarkerPositionSamplesValue.Text, out pcm);
long pcmBytes = 0;
long.TryParse(lblMarkerPositionBytesValue.Text, out pcmBytes);

// Create a new marker or fetch the existing marker from the database
Marker marker = null;
if (mode == AddEditMarkerWindowMode.Add)
{
// Insert the new marker into the database
marker = new Marker();
marker.MarkerId = Guid.NewGuid();
}
else if (mode == AddEditMarkerWindowMode.Edit)
{
// Select the existing marker from the database
marker = Main.Library.Facade.SelectMarker(markerId);
}

// Set properties
marker.AudioFileId = audioFile.Id;
marker.Name = txtName.Text;
marker.Comments = txtComments.Text;
marker.Position = txtPosition.Text;
marker.PositionBytes = pcm;
marker.PositionBytes = pcmBytes;

// Determine if an INSERT or an UPDATE is necessary
if (mode == AddEditMarkerWindowMode.Add)
{
// Insert marker
Main.Library.Facade.InsertMarker(marker);

// Refresh window as Edit Marker
markerId = marker.MarkerId;
mode = AddEditMarkerWindowMode.Edit;
Initialize();
}
else if (mode == AddEditMarkerWindowMode.Edit)
{
// Update marker
Main.Library.Facade.UpdateMarker(marker);
}

// Refresh main window marker list
Main.RefreshMarkers();
//// Get PCM and PCM bytes values
//long pcm = 0;
//long.TryParse(lblMarkerPositionSamplesValue.Text, out pcm);
//long pcmBytes = 0;
//long.TryParse(lblMarkerPositionBytesValue.Text, out pcmBytes);

//// Create a new marker or fetch the existing marker from the database
//Marker marker = null;
//if (mode == AddEditMarkerWindowMode.Add)
//{
// // Insert the new marker into the database
// marker = new Marker();
// marker.MarkerId = Guid.NewGuid();
//}
//else if (mode == AddEditMarkerWindowMode.Edit)
//{
// // Select the existing marker from the database
// marker = Main.Library.Facade.SelectMarker(markerId);
//}

//// Set properties
//marker.AudioFileId = audioFile.Id;
//marker.Name = txtName.Text;
//marker.Comments = txtComments.Text;
//marker.Position = txtPosition.Text;
//marker.PositionBytes = pcm;
//marker.PositionBytes = pcmBytes;

//// Determine if an INSERT or an UPDATE is necessary
//if (mode == AddEditMarkerWindowMode.Add)
//{
// // Insert marker
// Main.Library.Facade.InsertMarker(marker);

// // Refresh window as Edit Marker
// markerId = marker.MarkerId;
// mode = AddEditMarkerWindowMode.Edit;
// Initialize();
//}
//else if (mode == AddEditMarkerWindowMode.Edit)
//{
// // Update marker
// Main.Library.Facade.UpdateMarker(marker);
//}

//// Refresh main window marker list
//Main.RefreshMarkers();
}

/// <summary>
Expand All @@ -180,27 +181,26 @@ private void btnSave_Click(object sender, EventArgs e)
/// <param name="e">Event arguments</param>
private void btnPunchIn_Click(object sender, EventArgs e)
{
// Check if the player is currently playing
// test
if (!Main.Player.IsPlaying)
{
return;
}

// Get position
//long positionBytes = Main.Player.Playlist.CurrentItem.Channel.GetPosition();
//long positionSamples = ConvertAudio.ToPCM(positionBytes, 16, 2);
//string position = ConvertAudio.ToTimeString(positionBytes, 16, 2, 44100);

// Get position
long positionBytes = Main.Player.GetPosition();
long positionSamples = ConvertAudio.ToPCM(positionBytes, (uint)Main.Player.Playlist.CurrentItem.AudioFile.BitsPerSample, 2);
string position = ConvertAudio.ToTimeString(positionBytes, (uint)Main.Player.Playlist.CurrentItem.AudioFile.BitsPerSample, 2, (uint)Main.Player.Playlist.CurrentItem.AudioFile.SampleRate);

// Update controls
txtPosition.Text = position;
lblMarkerPositionSamplesValue.Text = positionSamples.ToString();
lblMarkerPositionBytesValue.Text = positionBytes.ToString();
//// Check if the player is currently playing
//if (!Main.Player.IsPlaying)
//{
// return;
//}

//// Get position
////long positionBytes = Main.Player.Playlist.CurrentItem.Channel.GetPosition();
////long positionSamples = ConvertAudio.ToPCM(positionBytes, 16, 2);
////string position = ConvertAudio.ToTimeString(positionBytes, 16, 2, 44100);

//// Get position
//long positionBytes = Main.Player.GetPosition();
//long positionSamples = ConvertAudio.ToPCM(positionBytes, (uint)Main.Player.Playlist.CurrentItem.AudioFile.BitsPerSample, 2);
//string position = ConvertAudio.ToTimeString(positionBytes, (uint)Main.Player.Playlist.CurrentItem.AudioFile.BitsPerSample, 2, (uint)Main.Player.Playlist.CurrentItem.AudioFile.SampleRate);

//// Update controls
//txtPosition.Text = position;
//lblMarkerPositionSamplesValue.Text = positionSamples.ToString();
//lblMarkerPositionBytesValue.Text = positionBytes.ToString();
}

/// <summary>
Expand All @@ -211,16 +211,16 @@ private void btnPunchIn_Click(object sender, EventArgs e)
/// <param name="e">Event arguments</param>
private void btnGoTo_Click(object sender, EventArgs e)
{
// Check if the player is currently playing
if (!Main.Player.IsPlaying)
{
return;
}

// Set position
uint position = 0;
uint.TryParse(lblMarkerPositionBytesValue.Text, out position);
Main.Player.SetPosition(position);
//// Check if the player is currently playing
//if (!Main.Player.IsPlaying)
//{
// return;
//}

//// Set position
//uint position = 0;
//uint.TryParse(lblMarkerPositionBytesValue.Text, out position);
//Main.Player.SetPosition(position);
}

/// <summary>
Expand All @@ -231,8 +231,8 @@ private void btnGoTo_Click(object sender, EventArgs e)
/// <param name="e">Event arguments</param>
private void txtName_TextChanged(object sender, EventArgs e)
{
// Validate form
ValidateForm();
//// Validate form
//ValidateForm();
}

/// <summary>
Expand All @@ -242,53 +242,53 @@ private void txtName_TextChanged(object sender, EventArgs e)
/// <param name="e">Event arguments</param>
private void txtPosition_TextChanged(object sender, EventArgs e)
{
// Convert 0:00.000 to MS
uint totalMS = ConvertAudio.ToMS(txtPosition.Text);
uint samples = ConvertAudio.ToPCM(totalMS, 44100); // Sample rate of the song, not of the mixer!
uint bytes = ConvertAudio.ToPCMBytes(samples, 16, 2);

// Set new values
lblMarkerPositionMSValue.Text = totalMS.ToString();
lblMarkerPositionSamplesValue.Text = samples.ToString();
lblMarkerPositionBytesValue.Text = bytes.ToString();

// Validate form
ValidateForm();
//// Convert 0:00.000 to MS
//uint totalMS = ConvertAudio.ToMS(txtPosition.Text);
//uint samples = ConvertAudio.ToPCM(totalMS, 44100); // Sample rate of the song, not of the mixer!
//uint bytes = ConvertAudio.ToPCMBytes(samples, 16, 2);

//// Set new values
//lblMarkerPositionMSValue.Text = totalMS.ToString();
//lblMarkerPositionSamplesValue.Text = samples.ToString();
//lblMarkerPositionBytesValue.Text = bytes.ToString();

//// Validate form
//ValidateForm();
}

/// <summary>
/// Validates the form and displays warning if needed.
/// </summary>
public void ValidateForm()
{
// Declare variables
bool isValid = true;
string warningMessage = string.Empty;

// Check if name is empty
if (String.IsNullOrEmpty(txtName.Text))
{
isValid = false;
warningMessage = "The marker must have a valid name.";
}

// Get song length in MS
uint msTotal = ConvertAudio.ToMS(audioFile.Length);
uint msMarker = ConvertAudio.ToMS(txtPosition.Text);

// Check if the position exceeds the song length
if (msMarker > msTotal)
{
isValid = false;
warningMessage = "The marker position cannot exceed the audio file length (" + audioFile.Length + ").";
}

// Set warning
panelWarning.Visible = !isValid;
lblWarning.Text = warningMessage;

// Enable/disable save button
btnSave.Enabled = isValid;
//// Declare variables
//bool isValid = true;
//string warningMessage = string.Empty;

//// Check if name is empty
//if (String.IsNullOrEmpty(txtName.Text))
//{
// isValid = false;
// warningMessage = "The marker must have a valid name.";
//}

//// Get song length in MS
//uint msTotal = ConvertAudio.ToMS(audioFile.Length);
//uint msMarker = ConvertAudio.ToMS(txtPosition.Text);

//// Check if the position exceeds the song length
//if (msMarker > msTotal)
//{
// isValid = false;
// warningMessage = "The marker position cannot exceed the audio file length (" + audioFile.Length + ").";
//}

//// Set warning
//panelWarning.Visible = !isValid;
//lblWarning.Text = warningMessage;

//// Enable/disable save button
//btnSave.Enabled = isValid;
}
}

Expand Down

0 comments on commit d9eb511

Please sign in to comment.