Changeset 138:efddf6e11c3c in verona

Timestamp:

Mar 10, 2011 3:54:57 PM (2 years ago)

Author:

laurent

Branch:

default

Message:

bug fix : media accessors

Files:

• phapi/phapi.h (modified) (2 diffs)
• phapi/phms_audiostream.c (modified) (4 diffs)
• phapi/phms_videostream.c (modified) (2 diffs)
• phcpp/phapipp.cpp (modified) (4 diffs)
• phcpp/phapipp.h (modified) (2 diffs)

phapi/phapi.h

@@ -1179 +1179 @@
   char *id;
   char *name;
-  unsigned int idx;
   unsigned int capabilities;
 };
@@ -1189 +1188 @@
         char *id;
         char *name;
-        unsigned int idx;
 };
         

phapi/phms_audiostream.c

@@ -1169 +1169 @@
         int device_num;
         const MSList *card_list = ms_snd_card_manager_get_list(ms_snd_card_manager_get());
-        int pos = 0;
         int i = 0;
 
@@ -1176 +1175 @@
                 return 0;
         *device_tab = osip_malloc(device_num * (sizeof(**device_tab) + 1));
-        for(;(card_list = ms_list_next(card_list)) != NULL; pos++)
-        {
-                if (((MSSndCard *)(card_list->data))->capabilities & MS_SND_CARD_CAP_PLAYBACK)
-                {
-                        ((*device_tab)[i]).idx = pos;
-                        ((*device_tab)[i]).id = osip_strdup(((MSSndCard *)(card_list->data))->id);
-                        ((*device_tab)[i]).name = osip_strdup(((MSSndCard *)(card_list->data))->name);
-                        ((*device_tab)[i]).capabilities = ((MSSndCard *)(card_list->data))->capabilities;
+        for(;card_list != NULL; card_list = card_list->next)
+        {
+                MSSndCard * card = (MSSndCard *)(card_list->data);
+                if (card->capabilities & MS_SND_CARD_CAP_PLAYBACK)
+                {
+                        ((*device_tab)[i]).id = osip_strdup(card->id);
+                        ((*device_tab)[i]).name = osip_strdup(card->name);
+                        ((*device_tab)[i]).capabilities = card->capabilities;
                         i++;
                 }
@@ -1195 +1194 @@
         int device_num;
         const MSList *card_list = ms_snd_card_manager_get_list(ms_snd_card_manager_get());
-        int pos = 0;
         int i = 0;
 
@@ -1202 +1200 @@
                 return 0;
         *device_tab = osip_malloc(device_num * (sizeof(**device_tab) + 1));
-        for(;(card_list = ms_list_next(card_list)) != NULL; pos++)
-        {
-                if (((MSSndCard *)(card_list->data))->capabilities & MS_SND_CARD_CAP_CAPTURE)
-                {
-                        ((*device_tab)[i]).idx = pos;
-                        ((*device_tab)[i]).id = osip_strdup(((MSSndCard *)(card_list->data))->id);
-                        ((*device_tab)[i]).name = osip_strdup(((MSSndCard *)(card_list->data))->name);
-                        ((*device_tab)[i]).capabilities = ((MSSndCard *)(card_list->data))->capabilities;
+        for(;card_list != NULL; card_list = card_list->next)
+        {
+                MSSndCard * card = (MSSndCard *)(card_list->data);
+                if (card->capabilities & MS_SND_CARD_CAP_CAPTURE)
+                {
+                        ((*device_tab)[i]).id = osip_strdup(card->id);
+                        ((*device_tab)[i]).name = osip_strdup(card->name);
+                        ((*device_tab)[i]).capabilities = card->capabilities;
                         i++;
                 }

phapi/phms_videostream.c

@@ -457 +457 @@
 {
         int device_num = 0;
-        int pos = 0;
+        int i = 0;
         const MSList *web_cam_list = ms_web_cam_manager_get_list(ms_web_cam_manager_get());
         
@@ -469 +469 @@
         {
                 MSWebCam * webcam = (MSWebCam*)web_cam_list->data;
-                
-                ((*device_tab)[pos]).idx = pos;
-                ((*device_tab)[pos]).id = osip_strdup(webcam->id);
-                ((*device_tab)[pos]).name = osip_strdup(webcam->name);
-                
-                pos++;
-        }
-        
-        return device_num;
+                ((*device_tab)[i]).id = osip_strdup(webcam->id);
+                ((*device_tab)[i]).name = osip_strdup(webcam->name);
+                i++;
+        }
+        
+        return i;
 }
 

phcpp/phapipp.cpp

@@ -264 +264 @@
 }
 
-std::map<unsigned int, char*> &phapi::getAudioCaptureDevices()
-{
-        ph_audio_card_desc_t* device_tab;
-        int pos;
-        int i;
-        std::map<unsigned int, char*> *device_map = new std::map<unsigned int, char*>;
+std::map<char*, char*> phapi::getAudioCaptureDevices()
+{
+        ph_audio_card_desc_t* device_tab = NULL;
+        int pos = 0;
+        int i = 0;
+        std::map<char*, char*> device_map;
 
         pos = phAudioCaptureCardList(&device_tab);
@@ -275 +275 @@
         for (i = 0; i < pos; i++)
         {
-                device_map->insert(std::pair<unsigned int, char*>(device_tab[i].idx, device_tab[i].id));
-                printf("MSSndCard idx:%d id:%s name:%s !!!!\n", device_tab[i].idx, device_tab[i].id, device_tab[i].name);
+                device_map.insert(std::pair<char*, char*>(device_tab[i].id, device_tab[i].id));
+                printf("MSSndCard id:%s name:%s !!!!\n", device_tab[i].id, device_tab[i].name);
         }
-        return *device_map;
-}
-
-std::map<unsigned int, char*> &phapi::getVideoWebcamDevices()
-{
-        ph_video_web_cam_desc_t* device_tab;
-        int pos;
-        int i;
-        std::map<unsigned int, char*> *device_map = new std::map<unsigned int, char*>;
+        
+        if(device_tab)
+                delete device_tab;
+        
+        return device_map;
+}
+
+std::map<char*, char*> phapi::getVideoWebcamDevices()
+{
+        ph_video_web_cam_desc_t* device_tab = NULL;
+        int pos =0;
+        int i = 0;
+        std::map<char *, char*> device_map;
                 
         pos = phVideoWebcamList(&device_tab);
@@ -292 +296 @@
         for (i = 0; i < pos; i++)
         {
-                device_map->insert(std::pair<unsigned int, char*>(device_tab[i].idx, device_tab[i].name));
-                printf("webcam idx:%d id:%s name:%s !!!!\n", device_tab[i].idx, device_tab[i].id, device_tab[i].name);
+                device_map.insert(std::pair<char*, char*>(device_tab[i].id, device_tab[i].name));
+                printf("webcam id:%s name:%s !!!!\n", device_tab[i].id, device_tab[i].name);
         }
-        return *device_map;
-}
-        
-std::map<unsigned int, char*> &phapi::getAudioPlaybackDevices()
-{
-        ph_audio_card_desc_t* device_tab;
-        int pos;
-        int i;
-        std::map<unsigned int, char*> *device_map = new std::map<unsigned int, char*>;
+        
+        if(device_tab)
+                delete device_tab;
+        
+        return device_map;
+}
+        
+std::map<char*, char*> phapi::getAudioPlaybackDevices()
+{
+        ph_audio_card_desc_t* device_tab = NULL;
+        int pos = 0;
+        int i = 0;
+        std::map<char*, char*> device_map;
 
         pos = phAudioPlaybackCardList(&device_tab);
@@ -309 +317 @@
         for (i = 0; i < pos; i++)
         {
-                device_map->insert(std::pair<unsigned int, char*>(device_tab[i].idx, device_tab[i].id));
-                //  printf("MSSndCard idx:%d id:%s name:%s !!!!\n", device_tab[i].idx, device_tab[i].id, device_tab[i].name);
+                device_map.insert(std::pair<char*, char*>(device_tab[i].id, device_tab[i].name));
         }
-        return *device_map;
+        
+        if(device_tab)
+                delete device_tab;
+        
+        return device_map;
 }
 

phcpp/phapipp.h

@@ -118 +118 @@
         virtual void setUaString(const char *uastr);
 
-        virtual std::map<unsigned int, char*> &getAudioCaptureDevices();
-        virtual std::map<unsigned int, char*> &getAudioPlaybackDevices();
-        virtual std::map<unsigned int, char*> &getVideoWebcamDevices();
+        virtual std::map<char*, char*> getAudioCaptureDevices();
+        virtual std::map<char*, char*> getAudioPlaybackDevices();
+        virtual std::map<char*, char*> getVideoWebcamDevices();
         
         virtual void changeAudioDevices(const char *devstr);
@@ -322 +322 @@
         }
 
-        std::map<unsigned int, char*> &getAudioCaptureDevices()
+        std::map<char*, char*> getAudioCaptureDevices()
     {
                 return phapi::getAudioCaptureDevices();
     }
 
-        std::map<unsigned int, char*> &getAudioPlaybackDevices()
+        std::map<char*, char*> getAudioPlaybackDevices()
     {
                 return phapi::getAudioPlaybackDevices();