From 17faa9f960aa7f1ce72e6b54a2d01f755d7b38be Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Mon, 25 Feb 2013 08:10:20 +0200
Subject: correct name

---
 sound_detector/iconv.c                | 50 +++++++++++++++++++++++++++++++++++
 sound_detector/iconv.h                |  3 +++
 sound_detector/main.cpp               |  2 +-
 sound_detector/sound_detector.project |  6 +++--
 sound_detector/toutf8.c               | 50 -----------------------------------
 sound_detector/toutf8.h               |  3 ---
 6 files changed, 58 insertions(+), 56 deletions(-)
 create mode 100644 sound_detector/iconv.c
 create mode 100644 sound_detector/iconv.h
 delete mode 100644 sound_detector/toutf8.c
 delete mode 100644 sound_detector/toutf8.h

diff --git a/sound_detector/iconv.c b/sound_detector/iconv.c
new file mode 100644
index 0000000..1601bd1
--- /dev/null
+++ b/sound_detector/iconv.c
@@ -0,0 +1,50 @@
+// Copyright © 2013 sss
+// 
+// This program 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; either version 2
+// of the License, or (at your option) any later version.
+// 
+// This program 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 this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifdef WIN32
+//iconv
+#include <stdint.h>
+#include <limits.h>
+#include <string.h>
+#include <stdlib.h>
+#include <iconv.h>
+
+char *to_utf8(const char *koi8r)
+{
+	iconv_t id = iconv_open("CP866", "WINDOWS-1251");
+	if((long)id == -1)
+	{
+		printf("failed to create iconv descriptor with error: %s\n", strerror(errno));
+		return NULL;
+	}
+	int len = strlen(koi8r), outlen = 0;
+	len++;
+	outlen = len * 2;
+	char *outbuf = (char*)malloc(len * 2), *op, *ip;
+	op = outbuf;
+	ip = koi8r;
+	int enc_len = iconv(id, &ip, &len, &op, &outlen);
+	if(enc_len == -1)
+	{
+		printf("failed to convert buffer with error: %s\n", strerror(errno));
+		return NULL;
+	}
+	//outbuf[len] = '\0';
+	return outbuf;
+}
+
+
+#endif
diff --git a/sound_detector/iconv.h b/sound_detector/iconv.h
new file mode 100644
index 0000000..49d42d7
--- /dev/null
+++ b/sound_detector/iconv.h
@@ -0,0 +1,3 @@
+#ifdef WIN32
+extern "C" char *to_utf8(const char *koi8r);
+#endif
diff --git a/sound_detector/main.cpp b/sound_detector/main.cpp
index b2064d8..295dc20 100644
--- a/sound_detector/main.cpp
+++ b/sound_detector/main.cpp
@@ -50,7 +50,7 @@
 #include <boost/filesystem.hpp>
 
 //internal
-#include "toutf8.h"
+#include "iconv.h"
 
 
 
diff --git a/sound_detector/sound_detector.project b/sound_detector/sound_detector.project
index 319e841..7908fb7 100644
--- a/sound_detector/sound_detector.project
+++ b/sound_detector/sound_detector.project
@@ -9,8 +9,8 @@
   <Dependencies/>
   <VirtualDirectory Name="src">
     <File Name="main.cpp"/>
-    <File Name="toutf8.c"/>
-    <File Name="toutf8.h"/>
+    <File Name="iconv.c"/>
+    <File Name="iconv.h"/>
   </VirtualDirectory>
   <Settings Type="Executable">
     <GlobalSettings>
@@ -38,6 +38,7 @@
       <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="./$(ProjectName)" CommandArguments="-d 4 -o. -s 5,2 -S 3,5" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[
+      
       ]]>
       </Environment>
       <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
@@ -81,6 +82,7 @@
       
       
       
+      
       ]]>
       </Environment>
       <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
diff --git a/sound_detector/toutf8.c b/sound_detector/toutf8.c
deleted file mode 100644
index 1601bd1..0000000
--- a/sound_detector/toutf8.c
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright © 2013 sss
-// 
-// This program 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; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program 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 this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifdef WIN32
-//iconv
-#include <stdint.h>
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <iconv.h>
-
-char *to_utf8(const char *koi8r)
-{
-	iconv_t id = iconv_open("CP866", "WINDOWS-1251");
-	if((long)id == -1)
-	{
-		printf("failed to create iconv descriptor with error: %s\n", strerror(errno));
-		return NULL;
-	}
-	int len = strlen(koi8r), outlen = 0;
-	len++;
-	outlen = len * 2;
-	char *outbuf = (char*)malloc(len * 2), *op, *ip;
-	op = outbuf;
-	ip = koi8r;
-	int enc_len = iconv(id, &ip, &len, &op, &outlen);
-	if(enc_len == -1)
-	{
-		printf("failed to convert buffer with error: %s\n", strerror(errno));
-		return NULL;
-	}
-	//outbuf[len] = '\0';
-	return outbuf;
-}
-
-
-#endif
diff --git a/sound_detector/toutf8.h b/sound_detector/toutf8.h
deleted file mode 100644
index 49d42d7..0000000
--- a/sound_detector/toutf8.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifdef WIN32
-extern "C" char *to_utf8(const char *koi8r);
-#endif
-- 
cgit v1.2.3