Changeset 949:28c34d323a39 in mediastreamer2

Timestamp:

Apr 27, 2010 5:55:21 PM (3 years ago)

Author:

Aymeric Moizard <jack@…>

Branch:

default

Message:

fix when card is removed after being detected

File:

• src/winsndds.cpp (modified) (3 diffs)

src/winsndds.cpp

@@ -1337 +1337 @@
         ms_DirectSoundCaptureCreate( &d->in_guid, &d->lpDirectSoundCapture, NULL );
 
+        if (d->lpDirectSoundCapture==NULL)
+                return;
+
         ZeroMemory(&captureDesc, sizeof(DSCBUFFERDESC));
         captureDesc.dwSize = sizeof(DSCBUFFERDESC);
@@ -1368 +1371 @@
         WinSndDs *d=(WinSndDs*)f->data;
 
-        ms_mutex_lock(&d->thread_lock);
-        d->thread_running=FALSE;
-        ms_cond_wait(&d->thread_cond,&d->thread_lock);
-        ms_mutex_unlock(&d->thread_lock);
-        ms_thread_join(d->thread,NULL);
-
-        ms_mutex_lock(&f->ticker->lock);
-        ms_ticker_set_time_func(f->ticker,NULL,NULL);
-        ms_mutex_unlock(&f->ticker->lock);
+        if (d->thread_running==TRUE)
+        {
+                ms_mutex_lock(&d->thread_lock);
+                d->thread_running=FALSE;
+                ms_cond_wait(&d->thread_cond,&d->thread_lock);
+                ms_mutex_unlock(&d->thread_lock);
+                ms_thread_join(d->thread,NULL);
+
+                ms_mutex_lock(&f->ticker->lock);
+                ms_ticker_set_time_func(f->ticker,NULL,NULL);
+                ms_mutex_unlock(&f->ticker->lock);
+        }
 
         if( d->lpDirectSoundInputBuffer )
@@ -1539 +1545 @@
                 ms_DirectSoundCreate( &d->out_guid, &d->lpDirectSound, NULL );
 
+                if (d->lpDirectSound==NULL)
+                {
+                        return ;
+                }
 
                 hWnd = GetDesktopWindow();