mpegts: fix printing bug and change potentially confusing var name.
This commit is contained in:
parent
d8a084d14c
commit
0a20d2d25b
4 changed files with 14 additions and 11 deletions
|
@ -409,7 +409,7 @@ struct mpegts_input
|
|||
|
||||
int mi_instance;
|
||||
|
||||
char *mi_displayname;
|
||||
char *mi_name;
|
||||
|
||||
int mi_priority;
|
||||
|
||||
|
|
|
@ -912,8 +912,8 @@ linuxdvb_frontend_added
|
|||
}
|
||||
|
||||
/* Defaults */
|
||||
if (!lfe->mi_displayname)
|
||||
lfe->mi_displayname = strdup(fe_path);
|
||||
if (!lfe->mi_name)
|
||||
lfe->mi_name = strdup(fe_path);
|
||||
|
||||
/* Copy info */
|
||||
lfe->lfe_number = fe_num;
|
||||
|
|
|
@ -34,8 +34,10 @@
|
|||
static const char *
|
||||
mpegts_input_class_get_title ( idnode_t *in )
|
||||
{
|
||||
static char buf[512];
|
||||
mpegts_input_t *mi = (mpegts_input_t*)in;
|
||||
return mi->mi_displayname;
|
||||
mi->mi_display_name(mi, buf, sizeof(buf));
|
||||
return buf;
|
||||
}
|
||||
|
||||
const idclass_t mpegts_input_class =
|
||||
|
@ -63,7 +65,7 @@ const idclass_t mpegts_input_class =
|
|||
.type = PT_STR,
|
||||
.id = "displayname",
|
||||
.name = "Name",
|
||||
.off = offsetof(mpegts_input_t, mi_displayname),
|
||||
.off = offsetof(mpegts_input_t, mi_name),
|
||||
.notify = idnode_notify_title_changed,
|
||||
},
|
||||
{}
|
||||
|
@ -83,8 +85,8 @@ mpegts_input_is_enabled ( mpegts_input_t *mi )
|
|||
static void
|
||||
mpegts_input_display_name ( mpegts_input_t *mi, char *buf, size_t len )
|
||||
{
|
||||
if (mi->mi_displayname)
|
||||
strncpy(buf, mi->mi_displayname, len);
|
||||
if (mi->mi_name)
|
||||
strncpy(buf, mi->mi_name, len);
|
||||
else
|
||||
*buf = 0;
|
||||
}
|
||||
|
@ -528,9 +530,10 @@ mpegts_input_stream_status
|
|||
}
|
||||
}
|
||||
|
||||
mm->mm_display_name(mm, buf, sizeof(buf));
|
||||
st->uuid = strdup(idnode_uuid_as_str(&mmi->mmi_id));
|
||||
st->input_name = strdup(mi->mi_displayname?:"");
|
||||
mi->mi_display_name(mi, buf, sizeof(buf));
|
||||
st->input_name = strdup(buf);
|
||||
mm->mm_display_name(mm, buf, sizeof(buf));
|
||||
st->stream_name = strdup(buf);
|
||||
st->subs_count = s;
|
||||
st->max_weight = w;
|
||||
|
|
|
@ -241,8 +241,8 @@ tsfile_input_create ( int idx )
|
|||
mi->mi_start_mux = tsfile_input_start_mux;
|
||||
mi->mi_stop_mux = tsfile_input_stop_mux;
|
||||
LIST_INSERT_HEAD(&tsfile_inputs, mi, mi_global_link);
|
||||
if (!mi->mi_displayname)
|
||||
mi->mi_displayname = strdup("TSFile");
|
||||
if (!mi->mi_name)
|
||||
mi->mi_name = strdup("TSFile");
|
||||
|
||||
/* Start table thread */
|
||||
tvhthread_create(&tid, NULL, mpegts_input_table_thread, mi, 1);
|
||||
|
|
Loading…
Add table
Reference in a new issue