diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 0d487dbca..b81a9d7c2 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -423,6 +423,8 @@ daemon_item.fcm_desc Zeigt die Anrufliste der FRITZ!Box und noch vieles mehr ... daemon_item.fcm_name FritzCallMonitor daemon_item.inadyn_desc Internet Automated Dynamic DNS Client daemon_item.inadyn_name In-a-Dyn +daemon_item.minidlna_desc Einfacher DLNA-Server +daemon_item.minidlna_name ReadyMedia (MiniDLNA) daemon_item.nfsserver_desc NFS Kernel Server daemon_item.nfsserver_name NFS-Server daemon_item.sambaserver_desc Server-Message-Block-Protokoll (SMB) Implementierung diff --git a/data/locale/english.locale b/data/locale/english.locale index e9a44ed90..c566c5227 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -423,6 +423,8 @@ daemon_item.fcm_desc Shows FRITZ!Box call list and much more ... daemon_item.fcm_name FritzCallMonitor daemon_item.inadyn_desc Internet Automated Dynamic DNS Client daemon_item.inadyn_name In-a-Dyn +daemon_item.minidlna_desc Simple DLNA server +daemon_item.minidlna_name ReadyMedia (MiniDLNA) daemon_item.nfsserver_desc NFS kernel server daemon_item.nfsserver_name NFS server daemon_item.sambaserver_desc Server-Message-Block-Protocol (SMB) implementation diff --git a/data/y-web/Y_NI_Plugin-control.yhtm b/data/y-web/Y_NI_Plugin-control.yhtm index 78930c4d1..f2819e179 100644 --- a/data/y-web/Y_NI_Plugin-control.yhtm +++ b/data/y-web/Y_NI_Plugin-control.yhtm @@ -194,6 +194,25 @@ + + + + + djmount + + + {=if-file-exists:/var/etc/.minidlnad~ + + ~ + + =} + + +   + + + + diff --git a/data/y-web/scripts/Y_NI_Plugin-control.sh b/data/y-web/scripts/Y_NI_Plugin-control.sh index 8036ea6cb..7f90c8db8 100644 --- a/data/y-web/scripts/Y_NI_Plugin-control.sh +++ b/data/y-web/scripts/Y_NI_Plugin-control.sh @@ -102,6 +102,16 @@ case "$1" in $y_path_sbin/service djmount stop >/dev/console rm -f /var/etc/.djmount ;; + minidlna_start) + echo "[$BNAME] minidlna start" + touch /var/etc/.minidlnad + $y_path_sbin/service minidlnad start >/dev/console + ;; + minidlna_stop) + echo "[$BNAME] minidlna stop" + $y_path_sbin/service minidlnad stop >/dev/console + rm -f /var/etc/.minidlnad + ;; xud_start) echo "[$BNAME] xupnpd start" touch /var/etc/.xupnpd diff --git a/data/y-web/scripts/Y_NI_Tools.sh b/data/y-web/scripts/Y_NI_Tools.sh index 896dd00ab..d83d33f97 100644 --- a/data/y-web/scripts/Y_NI_Tools.sh +++ b/data/y-web/scripts/Y_NI_Tools.sh @@ -488,6 +488,8 @@ case "$action" in p_ush_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ush_stop;; p_djm_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djm_start;; p_djm_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djm_stop;; + p_minidlna_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh minidlna_start;; + p_minidlna_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh minidlna_stop;; p_xud_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xud_start;; p_xud_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xud_stop;; p_cro_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh cro_start;; diff --git a/src/gui/daemon_control.cpp b/src/gui/daemon_control.cpp index 7a0e4f533..71d8a1e48 100644 --- a/src/gui/daemon_control.cpp +++ b/src/gui/daemon_control.cpp @@ -73,6 +73,7 @@ daemons_data_t daemons_data[]= {LOCALE_DAEMON_ITEM_DROPBEAR_NAME, LOCALE_DAEMON_ITEM_DROPBEAR_DESC, NEUTRINO_ICON_HINT_IMAGELOGO, "dropbear", 0 ,0}, {LOCALE_DAEMON_ITEM_DJMOUNT_NAME, LOCALE_DAEMON_ITEM_DJMOUNT_DESC, NEUTRINO_ICON_HINT_IMAGELOGO, "djmount", 0 ,0}, {LOCALE_DAEMON_ITEM_USHARE_NAME, LOCALE_DAEMON_ITEM_USHARE_DESC, NEUTRINO_ICON_HINT_IMAGELOGO, "ushare", 0 ,0}, + {LOCALE_DAEMON_ITEM_MINIDLNA_NAME, LOCALE_DAEMON_ITEM_MINIDLNA_DESC, NEUTRINO_ICON_HINT_IMAGELOGO, "minidlnad", 0 ,0}, {LOCALE_DAEMON_ITEM_XUPNPD_NAME, LOCALE_DAEMON_ITEM_XUPNPD_DESC, NEUTRINO_ICON_HINT_IMAGELOGO, "xupnpd", 0 ,0}, {LOCALE_DAEMON_ITEM_CROND_NAME, LOCALE_DAEMON_ITEM_CROND_DESC, NEUTRINO_ICON_HINT_IMAGELOGO, "crond", 0 ,0} }; diff --git a/src/system/locals.h b/src/system/locals.h index cd6ae2194..b9a4d45ff 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -450,6 +450,8 @@ typedef enum LOCALE_DAEMON_ITEM_FCM_NAME, LOCALE_DAEMON_ITEM_INADYN_DESC, LOCALE_DAEMON_ITEM_INADYN_NAME, + LOCALE_DAEMON_ITEM_MINIDLNA_DESC, + LOCALE_DAEMON_ITEM_MINIDLNA_NAME, LOCALE_DAEMON_ITEM_NFSSERVER_DESC, LOCALE_DAEMON_ITEM_NFSSERVER_NAME, LOCALE_DAEMON_ITEM_SAMBASERVER_DESC, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 41081e9a5..2e12bee34 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -450,6 +450,8 @@ const char * locale_real_names[] = "daemon_item.fcm_name", "daemon_item.inadyn_desc", "daemon_item.inadyn_name", + "daemon_item.minidlna_desc", + "daemon_item.minidlna_name", "daemon_item.nfsserver_desc", "daemon_item.nfsserver_name", "daemon_item.sambaserver_desc",