Lists tone
move rings to ringtones

Makefile.am

-SUBDIRS = utilspp stund src rings
+SUBDIRS = utilspp stund src ringtones

configure.ac

@@ -201,5 +201,5 @@ utilspp/Makefile \
 utilspp/functor/Makefile \
 utilspp/singleton/Makefile \
 stund/Makefile \
-rings/Makefile \
+ringtones/Makefile \
 )

sflphone.spec.in

@@ -8,7 +8,7 @@ Name:		%name
 Summary:	An other VoIP client
 Version:	%version
 Release:	%release
-Copyright:	GPL
+License:	GPL
 Group:		Networking/Utilities
 URL:		http://www.sflphone.org
 Packager:	Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>
@@ -33,8 +33,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %{prefix}/bin/sflphone
-%dir %{prefix}/share/sflphone/skins
-%{prefix}/share/sflphone/skins/*
-%dir %{prefix}/share/sflphone/pixmaps
-%{prefix}/share/sflphone/pixmaps/*
+%dir %{prefix}/share/sflphone/ringtones
+%{prefix}/share/sflphone/ringtones/*
 

src/global.h

@@ -41,19 +41,19 @@ typedef short int16;
 
 
 #define PROGNAME				"sflphone"
-#define SKINDIR					"skins"
-#define PIXDIR					"icons"
-#define RINGDIR					"rings"
+//#define SKINDIR					"skins"
+//#define PIXDIR					"icons"
+#define RINGDIR					"ringtones"
 #define CODECDIR				"codecs"
 
-#define SFLPHONE_LOGO			"logo_ico.png"
-#define TRAY_ICON				"tray-icon.png"
-#define PIXMAP_SIGNALISATIONS	"signalisations.png" 
-#define PIXMAP_AUDIO			"audio.png" 
-#define PIXMAP_VIDEO			"video.png" 
-#define PIXMAP_NETWORK			"network.png" 
-#define PIXMAP_PREFERENCES		"preferences.png" 
-#define PIXMAP_ABOUT			"about.png" 
+//#define SFLPHONE_LOGO			"logo_ico.png"
+//#define TRAY_ICON				"tray-icon.png"
+//#define PIXMAP_SIGNALISATIONS	"signalisations.png" 
+//#define PIXMAP_AUDIO			"audio.png" 
+//#define PIXMAP_VIDEO			"video.png" 
+//#define PIXMAP_NETWORK			"network.png" 
+//#define PIXMAP_PREFERENCES		"preferences.png" 
+//#define PIXMAP_ABOUT			"about.png" 
 
 #define MONO					1
 #define CHANNELS				2

src/gui/server/guiserverimpl.cpp

@@ -115,9 +115,9 @@ GUIServerImpl::getEvents(const std::string& sequenceId)
   return true;
 }
 bool
-GUIServerImpl::sendGetEventsEnd()
+GUIServerImpl::sendGetEventsEnd(const std::string& sequenceId)
 {
-  _requestManager.sendResponse(ResponseMessage("202", _getEventsSequenceId,
+  _requestManager.sendResponse(ResponseMessage("202", sequenceId,
 "getcallstatus request stopped me"));
   return true;
 }

src/gui/server/guiserverimpl.h

@@ -64,7 +64,7 @@ arg);
   TokenList arg);
 
   bool getEvents(const std::string& sequenceId);
-  bool sendGetEventsEnd();
+  bool sendGetEventsEnd(const std::string& sequenceId);
 
   bool outgoingCall (const std::string& seq, 
     const std::string& callid, 

src/gui/server/requestconfig.cpp

@@ -51,7 +51,7 @@ RequestZeroconfEvent::execute()
 ResponseMessage
 RequestCallStatus::execute()
 {
-  GUIServer::instance().sendGetEventsEnd();
+  GUIServer::instance().sendGetEventsEnd(_sequenceId);
   TokenList tk;
   tk.push_back("OK");
   std::string code = "205";

src/managerimpl.cpp

@@ -29,6 +29,7 @@
 //#include <arpa/inet.h>
 
 #include <cc++/thread.h>
+#include <cc++/file.h>
 
 #include <cstdlib> 
 #include <iostream>
@@ -1489,8 +1490,24 @@ ManagerImpl::getConfigList(const std::string& sequenceId, const std::string& nam
       iter++;
     }
     returnValue = true;
-  } else if (name=="") {
+  } else if (name=="ringtones") {
+    std::string path = std::string(PROGSHAREDIR) + "/" + RINGDIR;
+    try {
+      ost::Dir dir(path.c_str());
+      const char *cFileName = NULL;
+      std::string fileName;
+      std::string filePathName;
+      while ( (cFileName=dir++) != NULL ) {
+        fileName = cFileName;
+        filePathName = path + "/" + cFileName;
+        if (fileName.length() && fileName[0]!='.' && !ost::isDir(fileName.c_str())) {
+          _debug("Filename: %s\n", fileName.c_str());
+        }
+      }
       returnValue = true;
+    } catch (...) {
+      // error to open file dir
+    }
   } else if (name=="") {
     returnValue = true;
   } else if (name=="") {