mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1084,7 +1084,8 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
|
||||
break;
|
||||
case CTimerdClient::EVT_ANNOUNCE_ZAPTO :
|
||||
*msg = NeutrinoMessages::ANNOUNCE_ZAPTO;
|
||||
*data = 0;
|
||||
*data = (neutrino_msg_data_t)p;
|
||||
dont_delete_p = true;
|
||||
break;
|
||||
case CTimerdClient::EVT_ANNOUNCE_SHUTDOWN :
|
||||
*msg = NeutrinoMessages::ANNOUNCE_SHUTDOWN;
|
||||
|
Reference in New Issue
Block a user