diff --git a/conf/UMS.conf.default b/conf/UMS.conf.default index 03c9ae7..55c526e 100644 --- a/conf/UMS.conf.default +++ b/conf/UMS.conf.default @@ -102,7 +102,7 @@ language = # On headless systems, this should be set to true. # On macOS this is overridden to false. # Default: false -minimized = true +minimized = # Check for updates on program start # ---------------------------------- @@ -411,17 +411,19 @@ show_aperture_library = # Enable the cache # ---------------- -# Without a cache, when the client browses a folder, content is listed in -# real-time. With a cache, additional information becomes available and the -# cache can be browsed directly. +# WARNING: Disabling this will also disable the fully played status feature. +# When enabled, it makes all browsing significantly faster and enables features +# like played status tracking. # Default: true use_cache = # Show the "Media Library" folder # ------------------------------- -# Whether the Media Library folder is shown on clients. +# If enabled, the Media Library folder will be available, which lets you +# dynamically filter and sort your media by things like played status, genre, +# rating, etc. # Default: true -show_media_library_folder = false= +show_media_library_folder = # Browse compressed archives (zip, rar, etc.) # ------------------------------------------- @@ -459,13 +461,6 @@ show_live_subtitles_folder = true # Default: 10000 atz_limit = -# Show the "New Media" folder -# --------------------------- -# Whether the New Media folder is shown on clients. -# Contents of the folder provide access to all unplayed (new) media. -# Default: false -show_new_media_folder = - # Enable video resuming # --------------------- # Whether to show virtual "Resume:" files to allow resuming videos. @@ -490,13 +485,14 @@ show_recently_played_folder = # 3 = Move file to a different folder # 4 = Move file to recycle/trash bin. It will not do anything if this isn't # possible +# 5 = Move file to a different folder, and mark it like option 1 # # Default: 1 fully_played_action = # Fully played output directory # ----------------------------- -# The directory to move fully played files to if "Fully played action" is 3. +# The directory to move fully played files to if "Fully played action" is 3 or 5. # # Default: "" fully_played_output_directory = @@ -531,14 +527,14 @@ scan_shared_folders_on_startup = # On Linux: # - /user # Default: "" -folders = /home/yunohost.multimedia/share +folders =/home/yunohost.multimedia/share # Monitor played status of files # ------------------------------ -# List of folders to be monitored for changes. Folders that aren't monitored -# won't register new media with the New Media folder. +# List of folders to be monitored for changes like file additions/removals, and +# fully played status. # Default: "" -folders_monitored = /home/yunohost.multimedia/share +folders_monitored =/home/yunohost.multimedia/share # ---------------------------------------------------------------------------- # Transcoding Settings Tab @@ -548,14 +544,14 @@ folders_monitored = /home/yunohost.multimedia/share # ----------------------------------- # The list is in no particular order, and can be set to "None" to disable all # transcoding engines. -# Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,FFmpegAudio,tsMuxeRAudio,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,DCRaw" +# Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,FFmpegAudio,tsMuxeRAudio,youtubeDl,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,DCRaw" engines = # Ordered list of transcoding engines priority # -------------------------------------------- # All engines should be included regardless of their enabled status. Set blank # to have the default list generated upon next start. -# Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,AviSynthFFmpeg,AviSynthMEncoder,FFmpegAudio,tsMuxeRAudio,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,VLCVideo,DCRaw" +# Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,AviSynthFFmpeg,AviSynthMEncoder,FFmpegAudio,tsMuxeRAudio,youtubeDl,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,VLCVideo,DCRaw" engines_priority = # ---------------------------------------------------------------------------- @@ -1755,4 +1751,4 @@ log_database = alternativeffmpegpath = gui_log_search_case_sensitive = gui_log_search_use_regex = -gui_log_search_multiline = +gui_log_search_multiline = \ No newline at end of file diff --git a/conf/WEB.conf.default b/conf/WEB.conf.default index 88c3a61..ccd6cd7 100644 --- a/conf/WEB.conf.default +++ b/conf/WEB.conf.default @@ -2,9 +2,7 @@ # # # WEB.conf: configure support for web feeds and streams # # # -# NOTE: This file must be placed in the profile directory to work: # -# # -# http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=3507&p=32731#p32731 # +# NOTE: This file must be placed in the profile directory to work # # # # Supported types: # # # @@ -12,37 +10,29 @@ # # # Format for feeds: # # # -# type.folders,separated,by,commas=URL # +# type.folders,separated,by,commas=URL,,,name # # # # Format for streams: # # # -# type.folders,separated,by,commas=name for audio/video stream,URL,optional thumbnail URL # -# # -# For more web feed/stream options, see: # -# # -# http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=3507&p=37084#p37084 # -# http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=8776&p=46696#p46696 # +# type.folders,separated,by,commas=name,URL,optional thumbnail URL # # # ########################################################################################################## # image feeds -imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?format=rss2 -imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?id=39453068@N05&format=rss2 -imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?id=14362684@N08&format=rss2 -imagefeed.Web,Pictures=http://picasaweb.google.fr/data/feed/base/user/nefuisalbum/albumid/5218433104757705489?alt=rss&kind=photo&hl=en_US -imagefeed.Web,Pictures=http://picasaweb.google.com/data/feed/base/user/FenderStratRocker?alt=rss&kind=album&hl=en_US&access=public +imagefeed.Web,Pictures=https://api.flickr.com/services/feeds/photos_public.gne?format=rss2 +imagefeed.Web,Pictures=https://api.flickr.com/services/feeds/photos_public.gne?id=39453068@N05&format=rss2 +imagefeed.Web,Pictures=https://api.flickr.com/services/feeds/photos_public.gne?id=14362684@N08&format=rss2 # audio feeds audiofeed.Web,Podcasts=https://rss.art19.com/caliphate audiofeed.Web,Podcasts=https://www.nasa.gov/rss/dyn/Gravity-Assist.rss audiofeed.Web,Podcasts=http://podcasts.joerogan.net/feed -audiofeed.Web,Podcasts=http://wakingup.libsyn.com/rss +audiofeed.Web,Podcasts=https://wakingup.libsyn.com/rss audiofeed.Web,Podcasts=https://rss.art19.com/wolverine-the-long-night # video feeds -videofeed.Web,Vodcasts=http://feeds.feedburner.com/tedtalks_video +videofeed.Web,Vodcasts=https://feeds.feedburner.com/tedtalks_video videofeed.Web,Vodcasts=https://www.nasa.gov/rss/dyn/nasax_vodcast.rss -videofeed.Web,Vodcasts=https://www.unicef.org/rss/unicef_television_vodcast.xml videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC0PEAMcRK7Mnn2G1bCBXOWQ videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCccjdJEay2hpb5scz61zY6Q videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCOiUKJ6lMU3yHbVNtNXJyfw @@ -51,7 +41,10 @@ videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_ videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC8-Th83bH_thdKZDJCrn88g videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCzRBkt4a2hy6HObM3cl-x7g +# audio streams +audiostream.Web,Radio=RNZ,http://radionz-ice.streamguys.com/national.mp3,https://www.rnz.co.nz/assets/cms_uploads/000/000/159/RNZ_logo-Te-Reo-NEG-500.png + # video streams # videostream.Web,TV=France 24,mms://stream1.france24.yacast.net/f24_liveen,http://www.france24.com/en/sites/france24.com.en/themes/france24/logo-fr.png # videostream.Web,TV=BFM TV (French TV),mms://vipmms9.yacast.net/bfm_bfmtv,http://upload.wikimedia.org/wikipedia/en/6/62/BFMTV.png -# videostream.Web,Webcams=View of Shanghai Harbour,mmst://www.onedir.com/cam3,http://media-cdn.tripadvisor.com/media/photo-s/00/1d/4b/d8/pudong-from-the-bund.jpg +# videostream.Web,Webcams=View of Shanghai Harbour,mmst://www.onedir.com/cam3,http://media-cdn.tripadvisor.com/media/photo-s/00/1d/4b/d8/pudong-from-the-bund.jpg \ No newline at end of file