Commit 1bd67301 authored by Romain Vimont's avatar Romain Vimont
Browse files

input: remove triggering of legacy events

Now that the code has been adapted to receive "subtree added" and
"preparse ended" events from the input thread and preparser callbacks,
do not trigger the events on the input item anymore.
parent b8417f06
......@@ -2916,9 +2916,7 @@ static int EsOutVaControlLocked( es_out_t *out, int i_query, va_list args )
input_thread_t *input = p_sys->p_input;
input_item_node_t *node = va_arg(args, input_item_node_t *);
input_SendEventParsing(input, node);
/* TODO remove "PostAnd" once InputItemSubItemTreeAdded is not needed */
input_item_node_PostAndDelete(node);
input_item_node_Delete(node);
return VLC_SUCCESS;
}
......
......@@ -150,8 +150,6 @@ static int PreparserOpenInput( void* preparser_, void* req_, void** out )
error:
free( task );
/* TODO remove legacy input_item_SignalPreparseEnded() */
input_item_SignalPreparseEnded(req->item, ITEM_PREPARSE_FAILED);
if (req->cbs && req->cbs->on_preparse_ended)
req->cbs->on_preparse_ended(req->item, ITEM_PREPARSE_FAILED, req->userdata);
return VLC_EGENERIC;
......@@ -172,8 +170,6 @@ static void on_art_fetch_ended(input_item_t *item, bool fetched, void *userdata)
input_preparser_req_t *req = task->req;
input_item_SetPreparsed(req->item, true);
/* TODO remove legacy input_item_SignalPreparseEnded() */
input_item_SignalPreparseEnded(req->item, task->preparse_status);
if (req->cbs && req->cbs->on_preparse_ended)
req->cbs->on_preparse_ended(req->item, task->preparse_status, req->userdata);
......@@ -225,8 +221,6 @@ static void PreparserCloseInput( void* preparser_, void* task_ )
free(task);
input_item_SetPreparsed( item, true );
/* TODO remove legacy input_item_SignalPreparseEnded() */
input_item_SignalPreparseEnded( item, status );
if (req->cbs && req->cbs->on_preparse_ended)
req->cbs->on_preparse_ended(req->item, status, req->userdata);
}
......@@ -291,8 +285,6 @@ void input_preparser_Push( input_preparser_t *preparser,
break;
/* fallthrough */
default:
/* TODO remove legacy input_item_SignalPreparseEnded() */
input_item_SignalPreparseEnded( item, ITEM_PREPARSE_SKIPPED );
if (cbs && cbs->on_preparse_ended)
cbs->on_preparse_ended(item, ITEM_PREPARSE_SKIPPED, cbs_userdata);
return;
......@@ -301,12 +293,8 @@ void input_preparser_Push( input_preparser_t *preparser,
struct input_preparser_req_t *req = ReqCreate(item, cbs, cbs_userdata);
if (background_worker_Push(preparser->worker, req, id, timeout))
{
/* TODO remove legacy input_item_SignalPreparseEnded() */
input_item_SignalPreparseEnded( item, ITEM_PREPARSE_FAILED );
if (req->cbs && cbs->on_preparse_ended)
cbs->on_preparse_ended(item, ITEM_PREPARSE_FAILED, cbs_userdata);
}
ReqRelease(req);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment