#IQRV #comment [mediacontroller] 优化摄像头关闭流程

Other/libaudiomgr/linux/libaudiomgr_linux.cpp

@@ -495,28 +495,24 @@ static void pa_state_cb(pa_context* c, void* data)
 	{
 		// These are just here for reference
 	case PA_CONTEXT_UNCONNECTED:
-		//printf("unconnected\n");
 		break;
 	case PA_CONTEXT_CONNECTING:
 	case PA_CONTEXT_AUTHORIZING:
 	case PA_CONTEXT_SETTING_NAME:
-	default:
-		//printf("no state\n");
 		break;
 	case PA_CONTEXT_FAILED:
 	case PA_CONTEXT_TERMINATED:
 		*pa_ready = 2;
-		//printf("failed\n");
 		break;
 	case PA_CONTEXT_READY:
 		*pa_ready = 1;
-		//printf("ready\n");
+		break;
+	default:
 		break;
 	}
 }
 
 
-
 /*
  * clean up and disconnect
  * args:
@@ -571,7 +567,7 @@ int AudioMgrImpl::pa_get_devicelist()
 	if (pa_context_connect(pa_ctx, NULL, PA_CONTEXT_NOFLAGS, NULL) < 0)
 	{
 		if(m_callback)
-			m_callback->debug("AUDIO: PULSE - unable to connect to server: pa_context_connect failed");
+			m_callback->debug("AUDIO: PULSE - unable to connect to server: pa_context_connect failed!");
 		finish(pa_ctx, pa_ml);
 		return -1;
 	}
@@ -1275,7 +1271,6 @@ static void stream_request_cb(pa_stream* s, size_t length, void* data)
 
 		pa_stream_drop(s); /*clean the samples*/
 	}
-
 }
 
 
@@ -1388,8 +1383,7 @@ void* pulse_read_audio(void* data)
 	pastream_flag |= PA_STREAM_AUTO_TIMING_UPDATE;
 
 	char* dev = audio_ctx->list_input_devices[audio_ctx->device].name;
-	callback->debug("AUDIO: (pulse audio) connecting to device %s (channels %d rate %d)",
-			dev, ss.channels, ss.rate);
+	callback->debug("AUDIO: (pulse audio) connecting to device %s (channels %d rate %d)", dev, ss.channels, ss.rate);
 	r = pa_stream_connect_record(recordstream, dev, &bufattr, (pa_stream_flags_t)pastream_flag);
 	if (r < 0)
 	{
@@ -1424,7 +1418,7 @@ void* pulse_read_audio(void* data)
 	while (audio_ctx->stream_flag == AUDIO_STRM_ON){
 		pa_mainloop_iterate(pa_ml, 1, NULL);
 	}
-
+	pa_stream_set_read_callback(recordstream, NULL, NULL);
 	callback->debug("AUDIO: (pulse audio) stream terminated(%i)", audio_ctx->stream_flag);
 
 	pa_stream_disconnect(recordstream);