X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2Fcontacteditor%2FfrmContactEditorSound.cpp;h=795e97ab4e6c0dc7d09bba5e1a4fbe93aab6ce2b;hb=d91452d39ea9212c1b2185713576ebfa4f709310;hp=b4ab352d73c5b142867d062b54433dc3a7ea99bc;hpb=7c3e205236ee207eada4dee55857d839edc56c2e;p=xestiaab%2F.git
diff --git a/source/contacteditor/frmContactEditorSound.cpp b/source/contacteditor/frmContactEditorSound.cpp
index b4ab352..795e97a 100644
--- a/source/contacteditor/frmContactEditorSound.cpp
+++ b/source/contacteditor/frmContactEditorSound.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorSound.cpp - frmContactEditorSound form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see
+
#include "frmContactEditorSound.h"
#include
@@ -12,25 +30,36 @@ frmContactEditorSound::frmContactEditorSound( wxWindow* parent )
:
frmContactEditorSoundADT( parent )
{
+
+ // Setup the window.
+
EditorMode = FALSE;
sliPriority->Disable();
cmbType->Append(wxT(""));
cmbType->Append(_("Home"));
cmbType->Append(_("Work"));
+
}
void frmContactEditorSound::EnablePriority( wxCommandEvent& event )
{
+
+ // Enable/disable the priority setting.
+
if (chkUsePref->IsChecked()){
sliPriority->Enable();
} else {
sliPriority->Disable();
}
+
}
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
{
+
+ // Process audio data.
+
long ListCtrlIndex;
if (EditorMode == FALSE){
@@ -47,44 +76,11 @@ 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;
+
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);
@@ -193,8 +189,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;
@@ -257,11 +251,18 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
void frmContactEditorSound::CloseWindow( wxCommandEvent& event )
{
+
+ // Close this window.
+
this->Close();
+
}
void frmContactEditorSound::SetEditorMode(bool EditMode)
{
+
+ // Set the editor mode.
+
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
@@ -306,15 +307,14 @@ void frmContactEditorSound::SetEditorMode(bool EditMode)
cmbType->SetSelection(0);
}
-
- //strValue.Clear();
-
+
// Get the website priority.
intiter = SoundListPrefPtr->find(SoundListIndex);
- if (intiter->first == SoundListIndex && intiter->second > 0){
-
+ if (intiter->first == SoundListIndex && intiter->second > 0 &&
+ intiter != SoundListPrefPtr->end()){
+
sliPriority->SetValue(intiter->second);
sliPriority->Enable();
chkUsePref->SetValue(TRUE);
@@ -339,6 +339,8 @@ void frmContactEditorSound::SetupPointers(std::map *SoundList,
wxListCtrl *SoundListCtrl,
int SoundIndex )
{
+
+ // Setup the pointers.
SoundListPtr = SoundList;
SoundListAltIDPtr = SoundListAltID;