All items within the Sound tab of the Contact Editor now use ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Sound.cpp b/source/contacteditor/frmContactEditor-Sound.cpp
index 2485121..f6b6643 100644 (file)
--- 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);
     
 }