stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mpegts: put configurable displayname into input and ensure notify is sent

Browse source
This commit is contained in:
Adam Sutton 2013-07-06 23:37:26 +01:00
parent f1b56f7636
commit 15731c1a59
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/input/mpegts.h
View file

@ -361,6 +361,8 @@ struct mpegts_input
int mi_instance;
char *mi_displayname;
LIST_ENTRY(mpegts_input) mi_global_link;
mpegts_network_t *mi_network;

22
src/input/mpegts/mpegts_input.c
View file

@ -30,21 +30,18 @@
* Class definition
* *************************************************************************/
static const void *
mpegts_input_class_get_name ( void *in )
static const char *
mpegts_input_class_get_title ( idnode_t *in )
{
static char buf[256], *s = buf;
mpegts_input_t *mi = in;
*buf = 0;
if (mi->mi_display_name)
mi->mi_display_name(mi, buf, sizeof(buf));
return &s;
mpegts_input_t *mi = (mpegts_input_t*)in;
return mi->mi_displayname;
}
const idclass_t mpegts_input_class =
{
.ic_class = "mpegts_input",
.ic_caption = "MPEGTS Input",
.ic_get_title = mpegts_input_class_get_title,
.ic_properties = (const property_t[]){
{
.type = PT_BOOL,
@ -56,8 +53,8 @@ const idclass_t mpegts_input_class =
.type = PT_STR,
.id = "displayname",
.name = "Name",
.opts = PO_NOSAVE | PO_RDONLY,
.get = mpegts_input_class_get_name,
.off = offsetof(mpegts_input_t, mi_displayname),
.notify = idnode_notify_title_changed,
},
{}
}
@ -89,7 +86,10 @@ mpegts_input_is_enabled ( mpegts_input_t *mi )
static void
mpegts_input_display_name ( mpegts_input_t *mi, char *buf, size_t len )
{
*buf = 0;
if (mi->mi_displayname)
strncpy(buf, mi->mi_displayname, len);
else
*buf = 0;
}
int