Permalink
Browse files

Merge remote branch 'origin/master' into psl1ght-v2

Conflicts:
	src/video/ps3_vdec.c
  • Loading branch information...
2 parents e317b98 + 924885b commit 8d9cf8ae1fcead4a73adb33b6a24759eacc79f7d @andoma committed May 26, 2011
Showing with 10,507 additions and 2,886 deletions.
  1. +10 −5 Makefile
  2. +23 −20 README.markdown
  3. +23 −6 configure.linux
  4. +6 −6 configure.osx
  5. +3 −3 ext/audio/sid.c
  6. +283 −5 ext/spotify/api.h
  7. +46 −1 ext/spotify/apifunctions.h
  8. +7 −7 glwthemes/mono/commandmenu/cmd_details.view
  9. +5 −1 glwthemes/mono/directoryviews/array/directory.view
  10. +1 −1 glwthemes/mono/directoryviews/infobox/tvchannel.view
  11. BIN glwthemes/mono/icons/256x256/Favorite.png
  12. BIN glwthemes/mono/icons/256x256/Tags.png
  13. +12 −0 glwthemes/mono/pages/video.view
  14. +8 −22 glwthemes/mono/playdecks/tv.view
  15. +4 −0 glwthemes/mono/popups/auth.view
  16. +42 −4 plugins/headweb/headweb.js
  17. +2 −2 src/api/lastfm.c
  18. +26 −33 src/api/opensubtitles.c
  19. +2 −2 src/api/opensubtitles.h
  20. +2 −0 src/api/soap.c
  21. +1 −1 src/api/xmlrpc.c
  22. +18 −6 src/audio/audio_decoder.c
  23. +2 −2 src/audio/pulseaudio/pulseaudio.c
  24. +6 −5 src/backend/backend.c
  25. +9 −20 src/backend/backend.h
  26. +9 −9 src/backend/dvd/cdda.c
  27. +31 −17 src/backend/dvd/dvd.c
  28. +2 −2 src/backend/dvd/linux_dvd.c
  29. +78 −90 src/backend/htsp/htsp.c
  30. +31 −83 src/backend/rtmp/rtmp.c
  31. +3 −2 src/backend/sid/sid.c
  32. +290 −112 src/backend/spotify/spotify.c
  33. +6 −6 src/blobcache.c
  34. +6 −4 src/event.c
  35. +7 −2 src/event.h
  36. +52 −40 src/fileaccess/fa_audio.c
  37. +4 −2 src/fileaccess/fa_audio.h
  38. +21 −14 src/fileaccess/fa_backend.c
  39. +4 −1 src/fileaccess/fa_bundle.c
  40. +3 −1 src/fileaccess/fa_fs.c
  41. +29 −39 src/fileaccess/fa_gmefile.c
  42. +341 −160 src/fileaccess/fa_http.c
  43. +7 −0 src/fileaccess/fa_imageloader.c
  44. +210 −0 src/fileaccess/fa_libav.c
  45. +19 −0 src/fileaccess/fa_libav.h
  46. +1 −1 src/fileaccess/fa_locatedb.c
  47. +114 −193 src/fileaccess/fa_probe.c
  48. +2 −2 src/fileaccess/fa_probe.h
  49. +1 −1 src/fileaccess/fa_proto.h
  50. +11 −6 src/fileaccess/fa_rar.c
  51. +47 −50 src/fileaccess/fa_scanner.c
  52. +3 −3 src/fileaccess/fa_sidfile.c
  53. +3 −2 src/fileaccess/fa_smb.c
  54. +1 −1 src/fileaccess/fa_spotlight.c
  55. +235 −279 src/fileaccess/fa_video.c
  56. +2 −3 src/fileaccess/fa_video.h
  57. +7 −3 src/fileaccess/fa_zip.c
  58. +57 −159 src/fileaccess/fileaccess.c
  59. +14 −12 src/fileaccess/fileaccess.h
  60. +2 −5 src/htsmsg/htsbuf.c
  61. +9 −0 src/htsmsg/htsmsg.c
  62. +2 −0 src/htsmsg/htsmsg.h
  63. +149 −28 src/htsmsg/htsmsg_store.c
  64. +3 −1 src/htsmsg/htsmsg_store.h
  65. +81 −0 src/i18n.c
  66. +4 −0 src/i18n.h
  67. +9 −7 src/js/js.c
  68. +1 −1 src/js/js_io.c
  69. +22 −12 src/keyring.c
  70. +1 −1 src/keyring.h
  71. +8 −0 src/main.c
  72. +488 −111 src/media.c
  73. +66 −29 src/media.h
  74. +4,146 −0 src/misc/codepages.c
  75. +589 −5 src/misc/pixmap.c
  76. +16 −0 src/misc/pixmap.h
  77. +56 −45 src/misc/string.c
  78. +27 −5 src/misc/string.h
  79. +2 −2 src/{ui/glw/glw_unicode.c → misc/unicode_composition.c}
  80. +1 −1 src/{ui/glw/glw_unicode.h → misc/unicode_composition.h}
  81. +9 −9 src/navigator.c
  82. +22 −5 src/networking/net_common.c
  83. +2 −2 src/playqueue.c
  84. +1 −3 src/settings.c
  85. +17 −0 src/showtime.h
  86. +114 −0 src/text/fontconfig.c
  87. +72 −35 src/text/freetype.c
  88. +165 −0 src/text/parser.c
  89. +22 −1 src/text/text.h
  90. +12 −33 src/ui/glw/glw.c
  91. +0 −6 src/ui/glw/glw.h
  92. +4 −2 src/ui/glw/glw_event.c
  93. +2 −1 src/ui/glw/glw_event.h
  94. +1 −1 src/ui/glw/glw_keyintercept.c
  95. +0 −34 src/ui/glw/glw_opengl.c
  96. +0 −1 src/ui/glw/glw_opengl.h
  97. +3 −3 src/ui/glw/glw_rec.c
  98. +22 −225 src/ui/glw/glw_text_bitmap.c
  99. +2 −3 src/ui/glw/glw_texture.h
  100. +6 −1 src/ui/glw/glw_texture_loader.c
  101. +1 −1 src/ui/glw/glw_texture_opengl.c
  102. +3 −3 src/ui/glw/glw_texture_rsx.c
  103. +49 −32 src/ui/glw/glw_video_common.c
  104. +25 −7 src/ui/glw/glw_video_common.h
  105. +2 −3 src/ui/glw/glw_video_opengl.c
  106. +289 −141 src/ui/glw/glw_video_overlay.c
  107. +4 −5 src/ui/glw/glw_video_overlay.h
  108. +3 −4 src/ui/glw/glw_video_rsx.c
  109. +25 −3 src/ui/glw/glw_view_eval.c
  110. +0 −21 src/ui/glw/glw_x11.c
  111. +66 −1 src/ui/gu/gu_pages.c
  112. +6 −1 src/ui/gu/gu_pixbuf.c
  113. +9 −8 src/ui/linux/x11_common.c
  114. +12 −12 src/upnp/upnp.c
  115. +318 −107 src/upnp/upnp_browse.c
  116. +114 −165 src/video/{subtitles.c → ext_subtitles.c}
  117. +19 −25 src/video/{subtitles.h → ext_subtitles.h}
  118. +49 −25 src/video/ps3_vdec.c
  119. +9 −0 src/video/sub.h
  120. +569 −0 src/video/sub_ass.c
  121. +11 −2 src/video/vdpau.c
  122. +72 −19 src/video/video_decoder.c
  123. +11 −40 src/video/video_decoder.h
  124. +295 −0 src/video/video_overlay.c
  125. +56 −0 src/video/video_overlay.h
  126. +14 −20 src/video/video_playback.c
  127. +96 −0 src/video/video_settings.c
  128. +26 −0 src/video/video_settings.h
  129. +0 −167 src/video/video_subtitles.c
  130. +1 −0 support/configure.inc
  131. +2 −2 support/osx/README
  132. +1 −2 support/osx/buildenv.common.sh
  133. BIN support/ps3icon.png
  134. +0 −1 support/ps3setup
View
@@ -80,11 +80,13 @@ SRCS += src/misc/ptrvec.c \
src/misc/jpeg.c \
src/misc/gz.c \
src/misc/string.c \
+ src/misc/codepages.c \
src/misc/fs.c \
src/misc/extents.c \
src/misc/isolang.c \
src/misc/dbl.c \
src/misc/json.c \
+ src/misc/unicode_composition.c \
SRCS-${CONFIG_TREX} += ext/trex/trex.c
@@ -103,6 +105,7 @@ SRCS += src/htsmsg/htsbuf.c \
#
SRCS += src/fileaccess/fileaccess.c \
src/fileaccess/fa_probe.c \
+ src/fileaccess/fa_libav.c \
src/fileaccess/fa_imageloader.c \
src/fileaccess/fa_backend.c \
src/fileaccess/fa_scanner.c \
@@ -181,8 +184,10 @@ SRCS-$(CONFIG_HTTPSERVER) += \
#
SRCS += src/video/video_playback.c \
src/video/video_decoder.c \
- src/video/video_subtitles.c \
- src/video/subtitles.c \
+ src/video/video_overlay.c \
+ src/video/sub_ass.c \
+ src/video/ext_subtitles.c \
+ src/video/video_settings.c \
SRCS-$(CONFIG_DVD) += src/video/video_dvdspu.c
@@ -191,10 +196,11 @@ SRCS-$(CONFIG_VDPAU) += src/video/vdpau.c
SRCS-$(CONFIG_PS3_VDEC) += src/video/ps3_vdec.c
#
-# Audio subsys
+# Text rendering
#
SRCS-$(CONFIG_LIBFREETYPE) += src/text/freetype.c
-
+SRCS-$(CONFIG_LIBFONTCONFIG) += src/text/fontconfig.c
+SRCS += src/text/parser.c
#
# Audio subsys
@@ -273,7 +279,6 @@ SRCS-$(CONFIG_GLW) += src/ui/glw/glw.c \
src/ui/glw/glw_texture_loader.c \
src/ui/glw/glw_image.c \
src/ui/glw/glw_text_bitmap.c \
- src/ui/glw/glw_unicode.c \
src/ui/glw/glw_fx_texrot.c \
src/ui/glw/glw_bloom.c \
src/ui/glw/glw_cube.c \
View
@@ -12,45 +12,45 @@ For more information and latest versions, please visit:
First you need to configure:
- $ ./configure
+ ./configure
If any dependencies are missing the configure script will complain.
You then have the option to disable that particular module/subsystem.
- $ make
+ make
Build the binary, after build the binary resides in `build.linux/`.
Thus, to start it, just type:
- $ build.linux/showtime
+ build.linux/showtime
-If you need/want to build with a recent version of FFmpeg without
+If you need/want to build with a recent version of libav without
installing it on your system:
-Create an ffmpeg directory somewhere, perhaps in your home dir:
+Create an libav directory somewhere, perhaps in your home dir:
- $ cd
- $ mkdir ffmpeg
- $ cd ffmpeg
- $ git clone git://git.ffmpeg.org/ffmpeg.git src
+ cd
+ mkdir libav
+ cd libav
+ git clone git://git.libav.org/libav.git src
-Configure FFmpeg to build and install itself in current dir. Note that this
+Configure libav to build and install itself in current dir. Note that this
will build static libraries so you don't need to mess around with
`LD_LIBRARY_PATH` when running the binary. IF you enable shared libraries,
remember to set that up as well.
So while still in the same dir, do
- $ src/configure --prefix=${PWD}
- $ make -j4
- $ make install
+ src/configure --prefix=${PWD}
+ make -j4
+ make install
Now go back and reconfigure Showtime with `PKG_CONFIG_PATH` set to the
-directories where the .pc files resides from the FFmpeg install:
+directories where the .pc files resides from the libav install:
- $ cd showtime
- $ ./configure --pkg-config-path=${HOME}/ffmpeg/lib/pkgconfig
- $ make
+ cd showtime
+ ./configure --pkg-config-path=${HOME}/libav/lib/pkgconfig
+ make
## How to build for Mac OS X
@@ -73,9 +73,12 @@ If you choose the custome script way, please continue to read support/osx/README
MacPorts way:
-Install freetype using MacPorts:
+Install freetype and libav using MacPorts:
+
+ $ sudo /opt/local/bin/port install freetype ffmpeg-devel
- $ sudo /opt/local/bin/port install freetype ffmpeg
+ (there is no libav port when i write this but i hope it works with the
+ ffmpeg-devel port)
Now run configure
@@ -105,7 +108,7 @@ include paths to your local build tree.
For more information read support/osx/README
-TODO: universal binary, cant be done i one step as ffmpeg does not
+TODO: universal binary, cant be done i one step as libav does not
build when using multiple arch arguments to gcc
View
@@ -76,6 +76,7 @@ fatal() {
enable libfreetype
+enable libfontconfig
enable libasound
enable libpulse
enable lirc
@@ -211,37 +212,37 @@ echo >>${CONFIG_MAK} $CC_CONFIG_MAK
#
# libavcodec
#
-if pkg-config --atleast-version 52.72.0 libavcodec; then
+if pkg-config --atleast-version 53.0.0 libavcodec; then
echo >>${CONFIG_MAK} "LDFLAGS_cfg += " `pkg-config --libs libavcodec`
echo >>${CONFIG_MAK} "CFLAGS_cfg += " `pkg-config --cflags libavcodec`
echo "Using libavcodec: `pkg-config --modversion libavcodec`"
else
- echo "libavcodec 52.72.0 or newer not found."
+ echo "libavcodec 53.0.0 or newer not found."
die
fi
#
# libavformat
#
-if pkg-config --atleast-version 52.64.0 libavformat; then
+if pkg-config --atleast-version 53.0.0 libavformat; then
echo >>${CONFIG_MAK} "LDFLAGS_cfg += " `pkg-config --libs libavformat`
echo >>${CONFIG_MAK} "CFLAGS_cfg += " `pkg-config --cflags libavformat`
echo "Using libavformat: `pkg-config --modversion libavformat`"
else
- echo "libavformat 52.64.0 or newer not found."
+ echo "libavformat 53.0.0 or newer not found."
die
fi
#
# libavutil
#
-if pkg-config --atleast-version 50.15.0 libavutil; then
+if pkg-config --atleast-version 51.0.0 libavutil; then
echo >>${CONFIG_MAK} "LDFLAGS_cfg += " `pkg-config --libs libavutil`
echo >>${CONFIG_MAK} "CFLAGS_cfg += " `pkg-config --cflags libavutil`
echo "Using libavutil: `pkg-config --modversion libavutil`"
else
- echo "libavutil 50.15.0 or newer not found."
+ echo "libavutil 51.0.0 or newer not found."
die
fi
@@ -275,6 +276,22 @@ if enabled libfreetype; then
fi
+#
+# libfontconfig
+#
+if enabled libfontconfig; then
+ if pkg-config fontconfig; then
+ echo >>${CONFIG_MAK} "LDFLAGS_cfg += " `pkg-config --libs fontconfig`
+ echo >>${CONFIG_MAK} "CFLAGS_cfg += " `pkg-config --cflags fontconfig`
+ echo "Using libfontconfig: `pkg-config --modversion fontconfig`"
+ else
+ echo "libfontconfig not found"
+ echo "To compile without it, configure with: --disable-libfontconfig"
+ die
+ fi
+fi
+
+
#
# libx11
View
@@ -237,33 +237,33 @@ PKGS=""
#
# libavformat
#
-if pkg-config --atleast-version 52.64.0 libavformat; then
+if pkg-config --atleast-version 53.0.0 libavformat; then
PKGS+="libavformat "
echo "Using libavformat: `pkg-config --modversion libavformat`"
else
- echo "libavformat 52.64.0 or newer not found."
+ echo "libavformat 53.0.0 or newer not found."
die
fi
#
# libavcodec
#
-if pkg-config --atleast-version 52.72.2 libavcodec; then
+if pkg-config --atleast-version 53.0.0 libavcodec; then
PKGS+="libavcodec "
echo "Using libavcodec: `pkg-config --modversion libavcodec`"
else
- echo "libavcodec 52.72.2 or newer not found."
+ echo "libavcodec 53.0.0 or newer not found."
die
fi
#
# libavutil
#
-if pkg-config --atleast-version 50.15.0 libavutil; then
+if pkg-config --atleast-version 51.0.0 libavutil; then
PKGS+="libavutil "
echo "Using libavutil: `pkg-config --modversion libavutil`"
else
- echo "libavutil 50.15.0 or newer not found."
+ echo "libavutil 51.0.0 or newer not found."
die
fi
View
@@ -1219,7 +1219,7 @@ be_sidplayer_canhandle(const char *url)
*/
static event_t *
be_sidplayer_play(const char *url0, media_pipe_t *mp,
- char *errbuf, size_t errlen, int hold)
+ char *errbuf, size_t errlen, int hold, const char *memetype)
{
media_queue_t *mq = &mp->mp_audio;
char *url, *p;
@@ -1247,7 +1247,7 @@ be_sidplayer_play(const char *url0, media_pipe_t *mp,
*p++= 0;
subSong = atoi(p) - 1;
- if((fh = fa_open(url, errbuf, errlen)) == NULL)
+ if((fh = fa_open(url, errbuf, errlen, 0)) == NULL)
return NULL;
fsize = fa_read(fh, sidfile, sizeof(sidfile));
@@ -1265,7 +1265,7 @@ be_sidplayer_play(const char *url0, media_pipe_t *mp,
mp_set_playstatus_by_hold(mp, hold, NULL);
mp->mp_audio.mq_stream = 0;
- mp_set_play_caps(mp, MP_PLAY_CAPS_PAUSE);
+ mp_configure(mp, MP_PLAY_CAPS_PAUSE, MP_BUFFER_NONE);
mp_become_primary(mp);
Oops, something went wrong.

0 comments on commit 8d9cf8a

Please sign in to comment.