Add lastgood configuration to Loadsettings for guisettings

.gitignore

@@ -591,6 +591,8 @@ lib/cmyth/Makefile
 /xbmc/cores/amlplayer/Makefile
 /xbmc/cores/omxplayer/Makefile
 
+/xbmc/utils/Makefile
+
 # /lib/ffmpeg/
 /lib/ffmpeg/config.h
 /lib/ffmpeg/config.err
@@ -1099,6 +1101,7 @@ lib/cmyth/Makefile
 
 # /xbmc/network/
 /xbmc/network/Makefile
+/xbmc/network/linux/Makefile
 /xbmc/network/upnp/Makefile
 
 # /lib/libRTV/

Makefile.in

@@ -77,6 +77,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
                    xbmc/pvr/timers/pvrtimers.a \
                    xbmc/pvr/windows/pvrwindows.a \
                    xbmc/rendering/rendering.a \
+                   xbmc/security/security.a \
                    xbmc/settings/settings.a \
                    xbmc/storage/storage.a \
                    xbmc/utils/utils.a \

addons/skin.confluence/720p/DialogAccessPoints.xml

@@ -0,0 +1,179 @@
+<window id="141">
+	<defaultcontrol>3</defaultcontrol>
+	<include>dialogeffect</include>
+	<controls>
+		<control type="group">
+			<posx>340</posx>
+			<posy>110</posy>
+			<width>600</width>
+			<height>500</height>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>600</width>
+				<height>500</height>
+				<texture border="40">DialogBack.png</texture>
+				<visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>600</width>
+				<height>500</height>
+				<texture border="40">DialogBack2.png</texture>
+				<visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
+			</control>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>520</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label" id="1">
+				<description>heading label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>520</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>1046</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<posx>510</posx>
+				<posy>15</posy>
+				<width>64</width>
+				<height>32</height>
+				<label>-</label>
+				<font>-</font>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<onleft>3</onleft>
+				<onright>3</onright>
+				<onup>3</onup>
+				<ondown>3</ondown>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
+			<control type="list" id="3">
+				<posx>20</posx>
+				<posy>70</posy>
+				<width>530</width>
+				<height>400</height>
+				<onup>3</onup>
+				<ondown>3</ondown>
+				<onleft>61</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<itemlayout height="40" width="530">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>530</width>
+						<height>40</height>
+						<texture border="0,2,0,2">MenuItemNF.png</texture>
+					</control>
+					<control type="image">
+						<posx>475</posx>
+						<posy>10</posy>
+						<width>20</width>
+						<height>20</height>
+						<visible>!IsEmpty(ListItem.Property(encryption))</visible>
+						<texture>ap-lock.png</texture>
+					</control>
+					<control type="image">
+						<posx>440</posx>
+						<posy>5</posy>
+						<width>30</width>
+						<height>30</height>
+						<texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
+					</control>
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>40</width>
+						<height>40</height>
+						<texture>$INFO[ListItem.Property(state)].png</texture>
+					</control>
+					<control type="label">
+						<posx>40</posx>
+						<posy>0</posy>
+						<width>490</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="40" width="530">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>530</width>
+						<height>40</height>
+						<texture border="0,2,0,2">MenuItemFO.png</texture>
+					</control>
+					<control type="image">
+						<posx>475</posx>
+						<posy>10</posy>
+						<width>20</width>
+						<height>20</height>
+						<visible>!IsEmpty(ListItem.Property(encryption))</visible>
+						<texture>ap-lock.png</texture>
+					</control>
+					<control type="image">
+						<posx>440</posx>
+						<posy>5</posy>
+						<width>30</width>
+						<height>30</height>
+						<texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
+					</control>
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>40</width>
+						<height>40</height>
+						<texture>$INFO[ListItem.Property(state)].png</texture>
+					</control>
+					<control type="label">
+						<posx>40</posx>
+						<posy>0</posy>
+						<width>490</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>selected</textcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+				</focusedlayout>
+			</control>
+			<control type="scrollbar" id="61">
+				<posx>555</posx>
+				<posy>70</posy>
+				<width>25</width>
+				<height>400</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>ScrollBarNib.png</textureslidernib>
+				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+				<onleft>3</onleft>
+				<onright>3</onright>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+		</control>
+	</controls>
+</window>

addons/skin.confluence/media/Makefile.in

@@ -10,7 +10,7 @@ all: $(TARGET)
 .PHONY: force
 
 $(TARGET): $(XBMCTEX) $(IMAGES)
-ifeq (@USE_ANDROID@,1)
+ifeq (@ARCH@,arm)
 	$(XBMCTEX) -use_none -input . -output $(TARGET)
 else
 	$(XBMCTEX) -input . -output $(TARGET)

configure.in

@@ -30,6 +30,21 @@ AC_DEFUN([XB_ADD_PLAYER],
   esac
 ])
 
+# check for enabling additional codecs
+AC_DEFUN([XB_ADD_CODEC],
+[
+  AC_MSG_CHECKING([for $2])
+  case $add_codecs in
+    *$2*)
+      AC_SUBST([USE_$1], 1)
+      AC_DEFINE([HAS_$1], 1, [using $2])
+      AC_MSG_RESULT([enabling $2])
+      ;;
+    *)
+      AC_MSG_RESULT([$2 is not enabled])
+  esac
+])
+
 # check for library basenames
 AC_DEFUN([XB_FIND_SONAME],
 [
@@ -507,6 +522,12 @@ AC_ARG_ENABLE([gtest],
   [configure_gtest=$enableval],
   [configure_gtest=no])
 
+AC_ARG_ENABLE([codec],
+  [AS_HELP_STRING([--enable-codec],
+  [enable additional codecs from a list of comma separated names, (default is none, choices are amcodec)])],
+  [add_codecs=$enableval],
+  [add_codecs=no])
+
 ### External libraries options
 AC_ARG_ENABLE([external-libraries],
   [AS_HELP_STRING([--enable-external-libraries],
@@ -622,10 +643,12 @@ case $host in
      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
      ;;
   arm*-*-linux-gnu*)
-     use_texturepacker=no
+     use_texturepacker_native=yes
      ARCH="arm"
      use_arch="arm"
      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
+     CFLAGS="$CFLAGS -Wno-psabi -Wa,-mno-warn-deprecated"
+     CXXFLAGS="$CXXFLAGS -Wno-psabi -Wa,-mno-warn-deprecated"
      ;;
   arm*-*linux-android*)
      target_platform=target_android
@@ -1830,6 +1853,14 @@ case $add_players in
       ;;
 esac
 
+# additional internal codecs
+case $add_codecs in
+  *amcodec*)
+      AC_CHECK_HEADER([amlplayer/codec_error.h],, AC_MSG_ERROR($missing_headers))
+      XB_ADD_CODEC([LIBAMCODEC], [amcodec])
+      ;;
+esac
+
 # platform specific bin utilities
 if test "$host_vendor" != "apple" ; then
   AC_CHECK_PROG(HAVE_GAWK,gawk,"yes","no",)
@@ -2283,11 +2314,17 @@ else
 fi
 
 if test "x$add_players" != "xno"; then
-  final_message="$final_message\n  additional players:\tYes"
+  final_message="$final_message\n  additional players:\tYes, $add_players"
 else
   final_message="$final_message\n  additional players:\tNo"
 fi
 
+if test "x$add_codecs" != "xno"; then
+  final_message="$final_message\n  additional codecs:\tYes, $add_codecs"
+else
+  final_message="$final_message\n  additional codecs:\tNo"
+fi
+
 ### External libraries messages
 
 if test "$use_external_ffmpeg" = "yes"; then
@@ -2355,6 +2392,7 @@ OUTPUT_FILES="Makefile \
     xbmc/guilib/Makefile \
     xbmc/interfaces/Makefile \
     xbmc/network/Makefile \
+    xbmc/network/linux/Makefile \
     xbmc/network/upnp/Makefile \
     lib/libRTV/Makefile \
     lib/libexif/Makefile \
@@ -2387,7 +2425,8 @@ OUTPUT_FILES="Makefile \
     xbmc/peripherals/devices/Makefile \
     xbmc/android/activity/Makefile \
     xbmc/android/loader/Makefile \
-    xbmc/main/Makefile"
+    xbmc/main/Makefile \
+    xbmc/utils/Makefile"
 
 if test "$use_skin_touched" = "yes"; then
 OUTPUT_FILES="$OUTPUT_FILES addons/skin.touched/media/Makefile"

language/English/strings.po

@@ -2555,7 +2555,9 @@ msgctxt "#713"
 msgid "HTTP proxy"
 msgstr ""
 
-#empty string with id 714
+msgctxt "#714"
+msgid "- Network Connection"
+msgstr ""
 
 msgctxt "#715"
 msgid "- Assignment"
@@ -11015,8 +11017,20 @@ msgctxt "#33200"
 msgid "Detected New Connection"
 msgstr ""
 
-#empty strings from id 33201 to 33999
+msgctxt "#33201"
+msgid "Available connections"
+msgstr ""
+
+msgctxt "#33202"
+msgid "Disconnected"
+msgstr ""
+
+msgctxt "#33203"
+msgid "Connecting"
+msgstr ""
+
 #translators: no need to add these to your language files
+#empty strings from id 33204 to 33999
 
 msgctxt "#34000"
 msgid "Lame"

lib/ffmpeg/libavformat/rtpdec_h264.c

@@ -113,7 +113,7 @@ static int sdp_parse_fmtp_config_h264(AVStream * stream,
             h264_data->level_idc = level_idc;
         }
     } else  if (!strcmp(attr, "sprop-parameter-sets")) {
-        uint8_t start_sequence[]= { 0, 0, 1 };
+        uint8_t start_sequence[]= { 0, 0, 0, 1 };
         codec->extradata_size= 0;
         codec->extradata= NULL;
 
@@ -176,7 +176,7 @@ static int h264_handle_packet(AVFormatContext *ctx,
     uint8_t nal = buf[0];
     uint8_t type = (nal & 0x1f);
     int result= 0;
-    uint8_t start_sequence[]= {0, 0, 1};
+    uint8_t start_sequence[]= {0, 0, 0, 1};
 
 #ifdef DEBUG
     assert(data);

lib/ffmpeg/libavformat/rtsp.c

@@ -403,7 +403,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
         break;
     case 'a':
         if (av_strstart(p, "control:", &p)) {
-            if (s->nb_streams == 0) {
+            if (rt->nb_rtsp_streams == 0) {
                 if (!strncmp(p, "rtsp://", 7))
                     av_strlcpy(rt->control_uri, p,
                                sizeof(rt->control_uri));

lib/ffmpeg/libavformat/rtsp.h

@@ -35,8 +35,8 @@
  * Network layer over which RTP/etc packet data will be transported.
  */
 enum RTSPLowerTransport {
-    RTSP_LOWER_TRANSPORT_UDP = 0,           /**< UDP/unicast */
-    RTSP_LOWER_TRANSPORT_TCP = 1,           /**< TCP; interleaved in RTSP */
+    RTSP_LOWER_TRANSPORT_TCP = 0,           /**< TCP; interleaved in RTSP */
+    RTSP_LOWER_TRANSPORT_UDP = 1,           /**< UDP/unicast */
     RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2, /**< UDP/multicast */
     RTSP_LOWER_TRANSPORT_NB,
     RTSP_LOWER_TRANSPORT_HTTP = 8,          /**< HTTP tunneled - not a proper