[codegenerator] return None on null pointer, not empty vector

xbmc · Aug 14, 2015 · 51137e2 · 51137e2
1 parent cd26e5c
commit 51137e2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/xbmc/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp
@@ -426,26 +426,26 @@ namespace XBMCAddon
       }
     }
 
-    std::vector<String>* Player::getAvailableSubtitleStreams()
+    std::vector<String> Player::getAvailableSubtitleStreams()
     {
       if (g_application.m_pPlayer->HasPlayer())
       {
         int subtitleCount = g_application.m_pPlayer->GetSubtitleCount();
-        std::vector<String>* ret = new std::vector<String>(subtitleCount);
+        std::vector<String> ret(subtitleCount);
         for (int iStream=0; iStream < subtitleCount; iStream++)
         {
           SPlayerSubtitleStreamInfo info;
           g_application.m_pPlayer->GetSubtitleStreamInfo(iStream, info);
 
           if (info.language.length() > 0)
-            (*ret)[iStream] = info.language;
+            ret[iStream] = info.language;
           else
-            (*ret)[iStream] = info.name;
+            ret[iStream] = info.name;
         }
         return ret;
       }
 
-      return NULL;
+      return std::vector<String>();
     }
 
     void Player::setSubtitleStream(int iStream)
@@ -461,26 +461,26 @@ namespace XBMCAddon
       }
     }
 
-    std::vector<String>* Player::getAvailableAudioStreams()
+    std::vector<String> Player::getAvailableAudioStreams()
     {
       if (g_application.m_pPlayer->HasPlayer())
       {
         int streamCount = g_application.m_pPlayer->GetAudioStreamCount();
-        std::vector<String>* ret = new std::vector<String>(streamCount);
+        std::vector<String> ret(streamCount);
         for (int iStream=0; iStream < streamCount; iStream++)
         {
           SPlayerAudioStreamInfo info;
           g_application.m_pPlayer->GetAudioStreamInfo(iStream, info);
 
           if (info.language.length() > 0)
-            (*ret)[iStream] = info.language;
+            ret[iStream] = info.language;
           else
-            (*ret)[iStream] = info.name;
+            ret[iStream] = info.name;
         }
         return ret;
       }
 
-      return NULL;
+      return std::vector<String>();
     } 
 
     void Player::setAudioStream(int iStream)

diff --git a/xbmc/interfaces/legacy/Player.h b/xbmc/interfaces/legacy/Player.h
@@ -277,7 +277,7 @@ namespace XBMCAddon
       /**
        * getAvailableSubtitleStreams() -- get Subtitle stream names
        */
-      std::vector<String>* getAvailableSubtitleStreams();
+      std::vector<String> getAvailableSubtitleStreams();
 
       // Player_setSubtitleStream
       /**
@@ -317,7 +317,7 @@ namespace XBMCAddon
       /**
        * getAvailableAudioStreams() -- get Audio stream names
        */
-      std::vector<String>* getAvailableAudioStreams();
+      std::vector<String> getAvailableAudioStreams();
 
       /**
        * setAudioStream(stream) -- set Audio Stream.

diff --git a/xbmc/interfaces/python/typemaps/python.vector.outtm b/xbmc/interfaces/python/typemaps/python.vector.outtm
@@ -23,15 +23,15 @@
     boolean ispointer = swigTypeParser.SwigType_ispointer(type)
     String accessor = ispointer ? '->' : '.'
     seq = sequence.increment()
-%>
-    ${result} = PyList_New(0);
-<%
+
     if (ispointer)
     {
 %>
     if (${api} != NULL)
     { 
 <%  }  %>
+      ${result} = PyList_New(0);
+
       for (std::vector<${swigTypeParser.SwigType_str(vectype)}>::iterator iter = ${api}${accessor}begin(); iter != ${api}${accessor}end(); ++iter)
       {
         ${swigTypeParser.SwigType_str(swigTypeParser.SwigType_ltype(vectype))}& entry${seq} = *iter;
@@ -45,4 +45,4 @@
     {
 %>
     }
-<%  }  %>
+<%  }  %>