From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 13 Mar 2016 10:09:21 +0000 (+0000)
Subject: Removed commented out code from frmContactEditorSound
X-Git-Tag: release-0.11~113
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=e93aa9af2a9f8eaee9dcaa793c049e305b90081e

Removed commented out code from frmContactEditorSound
---

diff --git a/source/contacteditor/frmContactEditorSound.cpp b/source/contacteditor/frmContactEditorSound.cpp
index c903008..cad57b3 100644
--- a/source/contacteditor/frmContactEditorSound.cpp
+++ b/source/contacteditor/frmContactEditorSound.cpp
@@ -76,44 +76,13 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 		
 		wxSAudioFilename = fipSound->GetPath();
 
-/*		
-#if wxABI_VERSION < 20900
-		if (AudioFile.Open(wxSAudioFilename.c_str(), wxT("rb"))){
-#else
-		if (AudioFile.Open(wxSAudioFilename, wxT("rb"))){
-#endif
-
-*/
 		if (AudioFile.Open(wxSAudioFilename, wxFile::read)){
-            ssize_t flen;
+			
+			ssize_t flen;
 			len = AudioFile.Length();
 			
 			unsigned char* AudioFileData = new unsigned char[len];
 			flen = AudioFile.Read(AudioFileData, (size_t)len);
-
-			// Get MIME Type.
-			
-			/*const char *MIMEType;
-			magic_t MagicCookie = magic_open(MAGIC_MIME);			
-			magic_setflags(MagicCookie, MAGIC_MIME_TYPE);
-			
-			if (!MagicCookie){
-
-				wxMessageBox(_("An error occured with the support library for getting the picture type."), _("Error opening picture file"), wxICON_ERROR);			
-				return;
-				
-			}
-			
-			if (magic_load(MagicCookie, NULL) != 0) {
-			
-				wxMessageBox(_("An error occured whilst determining the picture type."), _("Error opening picture file"), wxICON_ERROR);
-				return;
-			
-			}
-			
-			MIMEType = magic_file(MagicCookie, wxSAudioFilename.mb_str());
-			wxSAudioMIMEType = wxString::FromUTF8(MIMEType);
-			magic_close(MagicCookie);*/
 			
 			wxSAudioMIMEType = GetMIME(wxSAudioFilename);
 
@@ -222,8 +191,6 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 		// Do not touch the audio file but update the settings
 		// associated with the audio file.
 	
-		
-	
 		long longSelected = -1;
 		wxString strValue;	
 		
@@ -342,9 +309,7 @@ void frmContactEditorSound::SetEditorMode(bool EditMode)
 			cmbType->SetSelection(0);
 		
 		}
-		
-		//strValue.Clear();
-		
+
 		// Get the website priority.
 		
 		intiter = SoundListPrefPtr->find(SoundListIndex);