X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2Fcontacteditor%2FfrmContactEditorSound.cpp;h=3c92b7c5dae762b14b33ca32a5bf3ab80121cee3;hb=ea191b2c0728f4ed18b3665efe00403dcca926cb;hp=6e1fab0840cc4c3fd44b71a28a89ae18593201f8;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git
diff --git a/source/contacteditor/frmContactEditorSound.cpp b/source/contacteditor/frmContactEditorSound.cpp
index 6e1fab0..3c92b7c 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
@@ -42,7 +60,7 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
wxString wxSAudioFilename;
wxString wxSAudioMIMEType;
sf::SoundBuffer AudioBuffer;
- size_t len;
+ wxFileOffset len;
std::string b64enc;
wxSAudioFilename = fipSound->GetPath();
@@ -56,11 +74,11 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
*/
if (AudioFile.Open(wxSAudioFilename, wxFile::read)){
- size_t flen;
+ ssize_t flen;
len = AudioFile.Length();
unsigned char* AudioFileData = new unsigned char[len];
- flen = AudioFile.Read(AudioFileData, len);
+ flen = AudioFile.Read(AudioFileData, (size_t)len);
// Get MIME Type.
@@ -90,7 +108,7 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
// Check to make sure it is an audio file.
- if (!AudioBuffer.loadFromMemory(AudioFileData, len)){
+ if (!AudioBuffer.loadFromMemory(AudioFileData, (size_t)len)){
// Can't load file. We must flee...
// Also show an error message too.
@@ -313,8 +331,9 @@ void frmContactEditorSound::SetEditorMode(bool EditMode)
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);