Fix crash when closing application while listelive station finder sti…

…ll retrieves pls files.
fishpond-haiku · May 18, 2017 · 26f3bbd · 26f3bbd
1 parent ee7931d
commit 26f3bbd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ V_MAJOR = 0
 V_MIDDLE = 0
 V_MINOR = 3
 V_VARIETY = B_APPV_DEVELOPMENT
-V_BUILD = 13
+V_BUILD = 14
 
 TARGET_DIR := ./dist
 PACKAGE = $(TARGET_DIR)/$(NAME)_$(VERSION)-$(ARCH).hpkg

diff --git a/PackageInfo b/PackageInfo
@@ -8,6 +8,8 @@ Stations including all their attributes are saved as Shoutcast playlist files in
 Please report back any bugs at https://github.com/fishpond-haiku/Haiku-Radio/issues.
 
 Last Updates:
+- 0.0.3-14 Terminate worker threads in listenlive station finder
+- 0.0.3-13 Fix cases where meta-info spans two different http buffers
 - 0.0.3-12 Allow station searches with keywords predefined by station search service
 - 0.0.3-10 Enhanced search on listen.live, handle http redirects 
 - 0.0.3-9 Limit data provided for sniffing format - allows ogg stations to play, better handling of m3u references, retrieve more information from Radio Networks database, increased network timeout for higher stability

diff --git a/StationFinderListenLive.cpp b/StationFinderListenLive.cpp
@@ -135,6 +135,9 @@ StationFinderListenLive::RegisterSelf() {
 
 StationFinderListenLive::~StationFinderListenLive() {
 	fPlsLookupList.MakeEmpty(false);
+	status_t status;
+	if (fLookupThread)
+		wait_for_thread(fLookupThread, &status);
 }
 
 BObjectList<Station>* 

diff --git a/StreamPlayer.cpp b/StreamPlayer.cpp
@@ -173,11 +173,11 @@ StreamPlayer::StartPlayThreadFunc(StreamPlayer* _this) {
         delete _this->fPlayer;
         _this->fPlayer    = NULL;
 		_this->Unlock();
-        _this->setState(StreamPlayer::Stopped);
+        _this->setState(Stopped);
         return _this->fInitStatus;
     }
 
-    _this->setState(StreamPlayer::Playing);
+    _this->setState(Playing);
 	_this->Unlock();
     return _this->fStatus;
 }

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
@@ -39,7 +39,7 @@
                    displayName="Important Files"
                    projectFiles="false"
                    kind="IMPORTANT_FILES_FOLDER">
-      <itemPath>/boot/home/projects/Radio/Makefile</itemPath>
+      <itemPath>/boot/home/projects/Haiku-Radio/Makefile</itemPath>
       <itemPath>/boot/home/projects/Radio/nbproject/private/launcher.properties</itemPath>
     </logicalFolder>
   </logicalFolder>
@@ -246,8 +246,8 @@
       </codeAssistance>
       <makefileType>
         <makeTool>
-          <buildCommandWorkingDir>/boot/home/projects/Radio</buildCommandWorkingDir>
-          <buildCommand>${MAKE} -f Makefile DEBUGGER=TRUE</buildCommand>
+          <buildCommandWorkingDir>/boot/home/projects/Haiku-Radio</buildCommandWorkingDir>
+          <buildCommand>${MAKE} -f Makefile "DEBUGGER=TRUE"</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>dist/Radio</executablePath>
           <ccTool>

diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
@@ -6,19 +6,7 @@
       </df>
       <df name="graphics">
       </df>
-      <df name="objects.x86-cc2-release">
-        <df name="package">
-          <df name="apps">
-          </df>
-          <df name="data">
-            <df name="deskbar">
-              <df name="menu">
-                <df name="Applications">
-                </df>
-              </df>
-            </df>
-          </df>
-        </df>
+      <df name="objects.x86-cc2-debug">
       </df>
       <in>About.cpp</in>
       <in>About.h</in>

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -5,26 +5,15 @@
     </code-assistance-data>
     <data xmlns="http://www.netbeans.org/ns/make-project-private/1">
         <activeConfTypeElem>0</activeConfTypeElem>
-        <activeConfIndexElem>0</activeConfIndexElem>
+        <activeConfIndexElem>1</activeConfIndexElem>
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/boot/home/projects/Haiku-Radio/StationFinder.h</file>
-            <file>file:/boot/home/projects/Haiku-Radio/StationFinderListenLive.cpp</file>
-            <file>file:/boot/home/projects/Haiku-Radio/Station.h</file>
-            <file>file:/boot/home/projects/Haiku-Radio/StreamIO.h</file>
             <file>file:/boot/home/projects/Haiku-Radio/Makefile</file>
             <file>file:/boot/home/projects/Haiku-Radio/Station.cpp</file>
             <file>file:/boot/home/projects/Haiku-Radio/StationFinder.cpp</file>
-            <file>file:/boot/home/projects/Haiku-Radio/StationFinderRadioNetwork.h</file>
-            <file>file:/boot/home/projects/Haiku-Radio/RadioApp.cpp</file>
-            <file>file:/boot/home/projects/Haiku-Radio/StationFinderRadioNetwork.cpp</file>
-            <file>file:/boot/home/projects/Haiku-Radio/StationFinderListenLive.h</file>
-            <file>file:/boot/home/projects/Haiku-Radio/Utils.cpp</file>
-            <file>file:/boot/home/projects/Haiku-Radio/.gitignore</file>
-            <file>file:/boot/home/projects/Haiku-Radio/HttpUtils.cpp</file>
-            <file>file:/boot/home/projects/Haiku-Radio/StreamIO.cpp</file>
+            <file>file:/boot/home/projects/Haiku-Radio/PackageInfo</file>
         </group>
     </open-files>
 </project-private>