Mercurial > pt1.oyama
comparison src/recpt1.c @ 177:1d6674183e76
Fix problem: If do not specify DLNA, will not call pthread_join(stream_thread,)
| author | Naoya OYAMA <naoya.oyama@gmail.com> |
|---|---|
| date | Wed, 07 Nov 2012 22:54:19 +0900 |
| parents | 03ab3ade9fe5 |
| children | a0bc3700a496 |
comparison
equal
deleted
inserted
replaced
| 176:2ae60285f383 | 177:1d6674183e76 |
|---|---|
| 1419 | 1419 |
| 1420 pthread_kill(signal_thread, SIGUSR1); | 1420 pthread_kill(signal_thread, SIGUSR1); |
| 1421 | 1421 |
| 1422 /* wait for threads */ | 1422 /* wait for threads */ |
| 1423 pthread_join(reader_thread, NULL); | 1423 pthread_join(reader_thread, NULL); |
| 1424 pthread_join(stream_thread, NULL); | |
| 1425 pthread_join(signal_thread, NULL); | 1424 pthread_join(signal_thread, NULL); |
| 1426 pthread_join(ipc_thread, NULL); | 1425 pthread_join(ipc_thread, NULL); |
| 1427 if ( use_dlna ) { | 1426 if ( use_dlna ) { |
| 1427 pthread_join(stream_thread, NULL); | |
| 1428 pthread_join(dlna_thread, NULL); | 1428 pthread_join(dlna_thread, NULL); |
| 1429 if ( channel_list ) | 1429 if ( channel_list ) |
| 1430 close_list_file(channel_list); | 1430 close_list_file(channel_list); |
| 1431 } | 1431 } |
| 1432 | 1432 |