Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bump version to reflect major (non-breaking) changes

language fixlets
  • Loading branch information...
commit d0a8a65c4ac581ae2652e46ee70dbf1e5e67f215 1 parent 071b5e4
@chocolateboy chocolateboy authored
View
2  CHANGELOG
@@ -1,7 +1,7 @@
Changelog:
==========
-1.??.? -
+1.53.0 - ????-??-??
Re-fix NPE when toggling HTTP Engine V2
Fix global custom MEncoder options
View
2  pom.xml
@@ -31,7 +31,7 @@
<artifactId>pms</artifactId>
<name>PS3 Media Server</name>
<packaging>jar</packaging>
- <version>1.52.2-SNAPSHOT</version>
+ <version>1.53.0-SNAPSHOT</version>
<url>http://www.ps3mediaserver.org/</url>
<inceptionYear>2008</inceptionYear>
View
84 src/main/external-resources/PMS.conf
@@ -3,13 +3,13 @@
# ============================================================================
# Introduction:
#
-# This file "PMS.conf" holds the configuration settings for PMS. These settings
+# This "PMS.conf" file holds the configuration settings for PMS. These settings
# are usually set using the PMS graphical user interface. If you are running
-# PMS on a headless system, you may not be able to kick off the GUI; instead
+# PMS on a headless system, you may not be able to kick off the GUI; instead,
# you can edit the PMS.conf file to control the operation of PMS. A restart of
# PMS is required after editing this file.
#
-# Commenting out an option or leaving it empty blank forces the PMS default
+# Commenting out an option or leaving it empty forces the PMS default
# that is indicated.
#
# Key value pairs
@@ -19,12 +19,12 @@
# in this file or set using the PMS GUI and saved. The value can take a number
# of different forms:
#
-# - toggle: a checkbox or boolean, either "true" or "false"
+# - toggle: a checkbox or boolean; either "true" or "false"
# - selector: a dropdown menu in the GUI, generating a string or numeric
# value. Available options will usually be stated below
-# - string: a short piece of text or a number
-# - text: a longer piece of text with embedded line breaks
-# - list: a comma separated list of strings or numbers
+# - string: a short text or a number
+# - text: a longer text with embedded line breaks
+# - list: a comma-separated list of strings or numbers
#
# In the file below the value type is shown after the GUI option label.
#
@@ -74,7 +74,7 @@ language =
# --------------
# GUI Option: Start Minimized (toggle)
# Sets whether the GUI should start when the program is launched.
-# On headless systems this should be "true", default is "false".
+# On headless systems, this should be "true"; default is "false".
minimized = false
# Check for updates
@@ -84,7 +84,7 @@ minimized = false
auto_update = false
# ---< Network Settings >-----------------------------------------------------
-# Generally these settings should not need changed from their defaults or
+# Generally these settings should not need to be changed from their defaults or
# settings determined automatically by the system. Changing them may make your
# PMS server disappear from your other devices.
@@ -110,7 +110,7 @@ hostname =
# Server port
# -----------
-# GUI Option: Force port of the server (string)
+# GUI Option: Force the port of the server (string)
# Sets the port PMS will listen on; usually should not need to be set unless
# another service has already grabbed the port.
# The default value is "", which means PMS will automatically pick port 5001.
@@ -126,7 +126,7 @@ ip_filter =
# Max Bandwidth
# -------------
-# GUI Option: Maximum bandwidth in M/bs (string)
+# GUI Option: Maximum bandwidth in Mb/s (string)
# Set the maximum bandwidth to be consumed by the server.
# Leaving the setting blank or zero switches off bandwidth throttling.
maximumbitrate = 110
@@ -142,13 +142,13 @@ http_engine_v2 = true
# Do not sleep
# ------------
# GUI Option: Prevent OS from sleeping while streaming (toggle)
-# If your host server has a power saving mode, use this option to prevent
+# If your host server has a power-saving mode, use this option to prevent
# the server hibernating or sleeping while it is streaming data.
prevents_sleep_mode = false
# GUI Option: Default renderer when automatic detection fails (selector)
# PMS can recognize many renderers automatically. Sometimes a renderer will
-# connect the PMS does not recognize. This option defines which renderer PMS
+# connect which PMS does not recognize. This option defines which renderer PMS
# should assume. Default value is empty, which means PMS will assume the
# "Unknown renderer".
renderer_default =
@@ -184,9 +184,9 @@ thumbnails = true
# start. Default value is 1 second.
thumbnail_seek_pos = 1
-# Use Mplayer for Thumbnails
+# Use MPlayer for Thumbnails
# --------------------------
-# GUI Option: Use Mplayer for Video Thumbnails (toggle)
+# GUI Option: Use MPlayer for video thumbnails (toggle)
# Whether or not to use MPlayer to generate the thumbnails for video;
# can produce better results than built-in method.
# Default is false, which will use the built-in method.
@@ -216,12 +216,12 @@ image_thumbnails = true
# Default value is 0.
audio_thumbnails_method = 0
-# Source of Video cover Art
+# Source of video cover art
# -------------------------
# GUI Option: Alternate video cover art folder (selector)
# Specify a folder below which appropriate cover art for videos might be
-# located. Providing no value (default) effectively disables video thumbnails
-# GUI offers a file-system navigator generating an absolute path.
+# located. Providing no value (default) effectively disables video thumbnails.
+# The GUI offers a file-system navigator which generates an absolute path.
alternate_thumb_folder =
# ---< Navigation/Parsing settings >------------------------------------------
@@ -270,7 +270,7 @@ hide_enginenames = false
# ----------------------
# GUI Option: Hide non-media folders (toggle)
# Choose whether or not to show folders which contain no viewable content.
-# Switching this on can slow browsing in the client (folders must be checked
+# Switching this on can slow down browsing in the client (folders must be checked
# for content first before showing them); using a cache (see below) can help.
# Default value is false.
hide_empty_folders = false
@@ -300,7 +300,7 @@ aperture = false
# ------------
# GUI Option: Enable cache (toggle)
# Without a cache, when the client browses a folder, content is listed in
-# real-time. With a cache additional information becomes available and
+# real-time. With a cache, additional information becomes available and
# the cache can be browsed directly. Default value is false.
usecache = false
@@ -320,7 +320,7 @@ hide_media_library_folder = false
# 1 - By date (newest first)
# 2 - By reverse date (oldest first)
# 3 - ASCIIbetical (i.e. using ASCII code values)
-# 4 - Alphanumeric
+# 4 - Alphanumeric (AKA natural sort e.g. "Season 2" before "Season 10")
# Default value is 0.
key_sort_method = 0
@@ -332,7 +332,7 @@ key_sort_method = 0
# Either define a list of specific folders containing media to be shared or
# allow the system to browse the whole disk of the server. The GUI provides
# a system navigation to generate a list of folders.
-# The list should contain a comma separated list of absolute path names or
+# The list should contain a comma-separated list of absolute path names, or
# leave it empty to let the system find media. Default value is empty.
folders =
@@ -365,16 +365,16 @@ maxvideobuffer = 400
# The default value is empty, which will make PMS figure this out itself.
nbcores =
-# Chapters #Transcode# folder support
+# Chapters #--TRANSCODE--# folder support
# -----------------------------------
-# GUI Option: Chapters #Transcode# folder support (toggle)
+# GUI Option: Chapters #--TRANSCODE--# folder support (toggle)
# Makes PMS create virtual chapter markers in a video file. These let
# you jump to a specific point in a video. Default value is false.
chapter_support = false
-# Chapters #Transcode# folder support interval
+# Chapters #--TRANSCODE--# folder support interval
# --------------------------------------------
-# GUI Option: Chapters #Transcode# folder support interval (string)
+# GUI Option: Chapters #--TRANSCODE--# folder support interval (string)
# Determines the interval time in minutes for virtual chapter markers.
# Default value is 5.
chapter_interval = 5
@@ -405,7 +405,7 @@ embed_dts_in_pcm = false
# ---------------------------
# GUI Option: DTS/FLAC to LPCM conversion (toggle)
# Choose whether or not the Pulse Code Modulation audio format should be
-# forced when using MEncoder as transcoding engine. The default value is
+# forced when using MEncoder as a transcoding engine. The default value is
# false.
mencoder_usepcm = false
@@ -426,22 +426,22 @@ mencoder_remux_mpeg2 = true
# MPEG-2 options
# --------------
# GUI Option: MPEG-2 options (string)
-# Sets the quality for MPEG-2 conversion; MPEG-2 is the fallback if PMS cannot
-# deliver to the client. The default value is "keyint=5:vqscale=1:vqmin=2"
+# Sets the quality for MPEG-2 conversion; MPEG-2 is the fallback format if the client
+# does not support a video format natively. The default value is "keyint=5:vqscale=1:vqmin=2"
mencoder_encode = keyint=5:vqscale=1:vqmin=2
# ---< Misc options >---------------------------------------------------------
# Definitely disable subitles
# ---------------------------
-# GUI Option: Definitely disable subitles (toggle)
+# GUI Option: Definitely disable subtitles (toggle)
# The default value is false.
mencoder_disablesubs = false
# Skip transcode for extensions
# -----------------------------
# GUI Option: Skip transcode for extensions (list)
-# Do not transcode files with an extensions in the list. The default value is
+# Do not transcode files with an extension in the list. The default value is
# empty.
notranscode =
@@ -515,7 +515,7 @@ mencoder_mux_compatible = true
mencoder_intelligent_sync = true
# GUI Option: Codec specific parameters (text)
-# Sets additional codec specific configuration options for MEncoder. Default
+# Sets additional codec-specific configuration options for MEncoder. Default
# value is empty.
codec_spec_script =
@@ -530,7 +530,7 @@ mencoder_decode =
# Audio language priority
# -----------------------
# GUI Option: Audio language priority (list)
-# A comma separated list of language codes that defines the priority for
+# A comma-separated list of language codes that defines the priority for
# MEncoder when choosing audio languages, where "und" stands for "undefined".
# For example: "eng,fre,jpn,ger,und". Default value is empty, which will let
# PMS pick the priority.
@@ -541,7 +541,7 @@ mencoder_audiolangs =
# Subtitle language priority
# --------------------------
# GUI Option: Subtitle language priority (list)
-# A comma separated list of language codes that defines the priority for
+# A comma-separated list of language codes that defines the priority for
# MEncoder when choosing subtitle languages, where "und" stands for
# "undefined". For example: "eng,fre,jpn,ger,und". Default value is empty,
# which will let PMS pick the priority.
@@ -565,7 +565,7 @@ forced_sub_tags = forced
# GUI Option: Audio language priority (string)
# Determine the string of audio language and subtitle language pairs
# ordered by priority for MEncoder to try to match. Audio language and
-# subtitle language should be comma separated as a pair, individual pairs
+# subtitle language should be comma separated as a pair; individual pairs
# should be semicolon separated. "*" can be used to match any language.
# Subtitle language can be defined as "off".
# For example: "en,off;jpn,eng;*,eng;*;*". Default value is empty.
@@ -621,7 +621,7 @@ mencoder_ass_defaultstyle = true
# Subtitle colour
# ---------------
# GUI Option: Subtitle colour (string)
-# The integer value for the subtitle colour. GUI offers a pallete to choose
+# The integer value for the subtitle colour. GUI offers a palette to choose
# from that will generate a number. Default is empty, causing PMS to pick
# white.
subs_color =
@@ -637,11 +637,11 @@ mencoder_ass_scale = 1.0
mencoder_ass_outline = 1
# GUI Option: Styled font shadow
-# The shadow parameter used ofr ASS subtitling. Default value is 1.
+# The shadow parameter used for ASS subtitling. Default value is 1.
mencoder_ass_shadow = 1
# GUI Option: Styled margin
-# The margine used for ASS subtitling. The default value is 10.
+# The margin used for ASS subtitling. The default value is 10.
mencoder_ass_margin = 10
# Plain font scale
@@ -668,7 +668,7 @@ mencoder_noass_subpos = 2
# Load subtitles
# --------------
# GUI Option: Load subtitles
-# Choose whether PMS should check for externa subtitle files with the same
+# Choose whether PMS should check for external subtitle files with the same
# name as the media (*.srt, *.sub, *.ass, etc.). The default value is true.
autoloadsrt = true
@@ -739,8 +739,8 @@ ffmpeg = -threads 2 -g 1 -qscale 1 -qmin 2
# value is 100.
maxaudiobuffer = 100
-# The minimum size (in MB) that PMS should use for the buffer used for
-# streaming media. Default value is 1.
+# The minimum size (in MB) that PMS should use for the streaming media buffer.
+# Default value is 1.
minwebbuffer = 1
# ---< Old deprecated options >-----------------------------------------------
@@ -748,5 +748,3 @@ minwebbuffer = 1
#tsmuxer_preremix_ac3 = false
# ---< Other settings saved by PMS >------------------------------------------
-do_not_remove_this_line = true
-
View
4 src/main/java/net/pms/configuration/PmsConfiguration.java
@@ -150,9 +150,9 @@
private static final String KEY_PLUGIN_DIRECTORY = "plugins";
private static final String KEY_PREVENTS_SLEEP = "prevents_sleep_mode";
private static final String KEY_PROFILE_NAME = "name";
+ private static final String KEY_PROXY_SERVER_PORT = "proxy";
private static final String KEY_RENDERER_DEFAULT = "renderer_default";
private static final String KEY_RENDERER_FORCE_DEFAULT = "renderer_force_default";
- private static final String KEY_PROXY_SERVER_PORT = "proxy";
private static final String KEY_SERVER_HOSTNAME = "hostname";
private static final String KEY_SERVER_PORT = "port";
private static final String KEY_SHARES = "shares";
@@ -2108,7 +2108,7 @@ public String getRendererDefault() {
/**
* Sets the name of the renderer to fall back on when header matching
- * fails. PMS will recognize the configured renderer instead of "Unknow
+ * fails. PMS will recognize the configured renderer instead of "Unknown
* renderer". Set to "" to make PMS return the unknown renderer when no
* match can be made.
*
View
8 src/main/java/net/pms/messages.properties
@@ -68,7 +68,7 @@ MEncoderAviSynth.9=#Be careful, the custom script MUST return the clip object\n
MEncoderAviSynth.10=<movie>\n
MEncoderAviSynth.11=<sub>\n
MEncoderAviSynth.12=return clip
-MEncoderVideo.0=Skip loop filter deblocking for h264. Can degrade quality.
+MEncoderVideo.0=Skip loop filter deblocking for H.264. Can degrade quality.
MEncoderVideo.1=Video/Audio decoder settings for MEncoder engine only
MEncoderVideo.2=A/V sync alternative method
MEncoderVideo.3=Use application default codec parameters (Recommended!)
@@ -121,7 +121,7 @@ MEncoderVideo.78=\# -quality: override video quality settings\n
MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n
MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n
MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n
-MEncoderVideo.88=\#for any H264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n
+MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n
MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n
MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync
MEncoderVideo.92=DVD/VOBsub subtitle quality (0-4) (higher is better):
@@ -202,14 +202,14 @@ PMS.3=A/V sync alternative method
PMS.4=Deinterlace Filter
PMS.5=Connected to PS3
PMS.6=Auto load .srt/.sub subtitles
-PMS.7=SkipLoopFilter for H264 Decoding (Could degrade quality)
+PMS.7=SkipLoopFilter for H.264 Decoding (Could degrade quality)
PMS.8=Subtitles
PMS.9=All Audio Playlists
PMS.10=Definitely disable subtitles
PMS.11=All Audio Tracks
PMS.12=By Date
PMS.13=By Artist
-PMS.14=Default H264 Remux with MEncoder
+PMS.14=Default H.264 Remux with MEncoder
PMS.16=By Album
PMS.17=Unknown renderer
PMS.18=Connected
Please sign in to comment.
Something went wrong with that request. Please try again.