X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Sound.cpp;h=f6b6643abc50c2844edd87d669d3e9327ee3a42d;hb=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab;hp=c19b947a89291d8c2175c7cec3bb7cd94e203fcf;hpb=d06d0b1d631e7a48c34738397e98651f541d4000;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Sound.cpp b/source/contacteditor/frmContactEditor-Sound.cpp
index c19b947..f6b6643 100644
--- a/source/contacteditor/frmContactEditor-Sound.cpp
+++ b/source/contacteditor/frmContactEditor-Sound.cpp
@@ -1,6 +1,6 @@
 // frmContactEditor-Sound.cpp - frmContactEditor Sound tab subroutines.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -28,16 +28,16 @@ void frmContactEditor::AddSound( wxCommandEvent& event )
     
     frmContactEditorSound *frameCESound = new frmContactEditorSound ( this );
     frameCESound->SetEditorMode(FALSE);
-    intResult = GetLastInt(&SoundsList);
-    frameCESound->SetupPointers(&SoundsList,
-                                &SoundsListAltID,
-                                &SoundsListPID,
-                                &SoundsListType,
-                                &SoundsListAudioType,
-                                &SoundsListAudioEncType,
-                                &SoundsListTokens,
-                                &SoundsListMediatype,
-                                &SoundsListPref,
+    intResult = GetLastInt(&ContactEditorData.SoundsList);
+    frameCESound->SetupPointers(&ContactEditorData.SoundsList,
+                                &ContactEditorData.SoundsListAltID,
+                                &ContactEditorData.SoundsListPID,
+                                &ContactEditorData.SoundsListType,
+                                &ContactEditorData.SoundsListAudioType,
+                                &ContactEditorData.SoundsListAudioEncType,
+                                &ContactEditorData.SoundsListTokens,
+                                &ContactEditorData.SoundsListMediatype,
+                                &ContactEditorData.SoundsListPref,
                                 lboSounds,
                                 (intValueSeek));
     frameCESound->ShowModal();
@@ -57,15 +57,15 @@ void frmContactEditor::ModifySound( wxCommandEvent& event )
     }
     
     frmContactEditorSound *frameCESound = new frmContactEditorSound ( this );
-    frameCESound->SetupPointers(&SoundsList,
-                                &SoundsListAltID,
-                                &SoundsListPID,
-                                &SoundsListType,
-                                &SoundsListAudioType,
-                                &SoundsListAudioEncType,
-                                &SoundsListTokens,
-                                &SoundsListMediatype,
-                                &SoundsListPref,
+    frameCESound->SetupPointers(&ContactEditorData.SoundsList,
+                                &ContactEditorData.SoundsListAltID,
+                                &ContactEditorData.SoundsListPID,
+                                &ContactEditorData.SoundsListType,
+                                &ContactEditorData.SoundsListAudioType,
+                                &ContactEditorData.SoundsListAudioEncType,
+                                &ContactEditorData.SoundsListTokens,
+                                &ContactEditorData.SoundsListMediatype,
+                                &ContactEditorData.SoundsListPref,
                                 lboSounds,
                                 intSelectedData);
     frameCESound->SetEditorMode(TRUE);
@@ -87,10 +87,10 @@ void frmContactEditor::DeleteSound( wxCommandEvent& event )
     
     lboSounds->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &SoundsList, &SoundsListAltID,
-                  &SoundsListPID, &SoundsListType, &SoundsListAudioType,
-                  &SoundsListAudioEncType, &SoundsListTokens, &SoundsListMediatype,
-                  &SoundsListPref);
+    DeleteMapData(intSelectedData, &ContactEditorData.SoundsList, &ContactEditorData.SoundsListAltID,
+                  &ContactEditorData.SoundsListPID, &ContactEditorData.SoundsListType, &ContactEditorData.SoundsListAudioType,
+                  &ContactEditorData.SoundsListAudioEncType, &ContactEditorData.SoundsListTokens, &ContactEditorData.SoundsListMediatype,
+                  &ContactEditorData.SoundsListPref);
     
 }
 
@@ -171,7 +171,7 @@ void frmContactEditor::PlaySound( wxCommandEvent& event )
     
     std::map<int, std::string>::iterator initier;
     
-    initier = SoundsList.find(intSelectedData);
+    initier = ContactEditorData.SoundsList.find(intSelectedData);
     
     base64dec = base64_decode(initier->second);
     base64declen = base64dec.size();
@@ -219,8 +219,8 @@ void frmContactEditor::SaveSound( wxCommandEvent &event )
 	std::map<int,std::string>::iterator initier;
 	std::map<int,wxString>::iterator soundtypeiter;
     
-	initier = SoundsList.find(intSelectedData);
-	soundtypeiter = SoundsListAudioType.find(intSelectedData);
+	initier = ContactEditorData.SoundsList.find(intSelectedData);
+	soundtypeiter = ContactEditorData.SoundsListAudioType.find(intSelectedData);
 	
 	// Open up the dialog to save the picture.
 	
@@ -241,7 +241,7 @@ void frmContactEditor::SaveSound( wxCommandEvent &event )
 	
 		std::string base64dec;
 		
-		initier = SoundsList.find(intSelectedData);
+		initier = ContactEditorData.SoundsList.find(intSelectedData);
 		base64dec = base64_decode(initier->second);
 		
 		SoundFile.Write(base64dec.c_str(), (size_t)base64dec.size());