Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (5)
  • Alexandre Janniaux's avatar
    contrib: shout: update to 2.4.6 · 85268b42
    Alexandre Janniaux authored and Steve Lhomme's avatar Steve Lhomme committed
    The commit patches src/icy.c and src/legacy.c to include <stdlib.h> or
    <stdio.h>, so as to avoid FTBFS where free(), malloc(), and snprintf()
    have no valid prototype before usage.
    85268b42
  • Alexandre Janniaux's avatar
    configure.ac: bump libshout to 2.4.3 · cb5d59c9
    Alexandre Janniaux authored and Steve Lhomme's avatar Steve Lhomme committed
    cb5d59c9
  • Alexandre Janniaux's avatar
    shout: extract format from function call · 1b651397
    Alexandre Janniaux authored and Steve Lhomme's avatar Steve Lhomme committed
    It makes the call more readable, the line less long for the change into
    shout_set_content_format, and it makes it easier to potentially change
    the format later.
    1b651397
  • Alexandre Janniaux's avatar
    shout: fix deprecated shout_set_* functions for meta · 13b7adb9
    Alexandre Janniaux authored and Steve Lhomme's avatar Steve Lhomme committed
    The shout_set_name/description/genre/url were deprecated[^1] in 2.4.0,
    whereas the new shout_set_meta was added[^2] ten years ago which already
    commented the previous function as obsolete.
    
    [^1]: https://github.com/xiph/Icecast-libshout/commit/559e61ec7a1a02f2da6e7a2bfadfdb1b1147cccd
    [^2]: https://github.com/xiph/Icecast-libshout/commit/932a7742213c0aa4c8f87da4fac32b16c6641ff3
    
    Fixes the following warnings:
    
        ../../modules/access_output/shout.c: In function ‘Open’:
        ../../modules/access_output/shout.c:211:10: warning: ‘shout_set_name’ is deprecated: use shout_set_meta() with SHOUT_META_NAME [-Wdeprecated-declarations]
          211 |          || shout_set_name( p_shout, psz_name ) != SHOUTERR_SUCCESS
              |          ^~
        In file included from ../../modules/access_output/shout.c:53:
        /usr/include/shout/shout.h:348:5: note: declared here
          348 | int shout_set_name(shout_t *self, const char *name) SHOUT_ATTR_F_DEPRECATED("use shout_set_meta() with SHOUT_META_NAME"); // obsolete
              |     ^~~~~~~~~~~~~~
        ../../modules/access_output/shout.c:212:10: warning: ‘shout_set_description’ is deprecated: use shout_set_meta() with SHOUT_META_DESCRIPTION [-Wdeprecated-declarations]
          212 |          || shout_set_description( p_shout, psz_description ) != SHOUTERR_SUCCESS
              |          ^~
        /usr/include/shout/shout.h:357:5: note: declared here
          357 | int shout_set_description(shout_t *self, const char *description) SHOUT_ATTR_F_DEPRECATED("use shout_set_meta() with SHOUT_META_DESCRIPTION"); // obsolete
              |     ^~~~~~~~~~~~~~~~~~~~~
        ../../modules/access_output/shout.c:213:10: warning: ‘shout_set_genre’ is deprecated: use shout_set_meta() with SHOUT_META_GENRE [-Wdeprecated-declarations]
          213 |          || shout_set_genre( p_shout, psz_genre ) != SHOUTERR_SUCCESS
              |          ^~
        /usr/include/shout/shout.h:354:5: note: declared here
          354 | int shout_set_genre(shout_t *self, const char *genre) SHOUT_ATTR_F_DEPRECATED("use shout_set_meta() with SHOUT_META_GENRE"); // obsolete
              |     ^~~~~~~~~~~~~~~
        ../../modules/access_output/shout.c:214:10: warning: ‘shout_set_url’ is deprecated: use shout_set_meta() with SHOUT_META_URL [-Wdeprecated-declarations]
          214 |          || shout_set_url( p_shout, psz_url ) != SHOUTERR_SUCCESS
              |          ^~
        /usr/include/shout/shout.h:351:5: note: declared here
          351 | int shout_set_url(shout_t *self, const char *url) SHOUT_ATTR_F_DEPRECATED("use shout_set_meta() with SHOUT_META_URL"); // obsolete
              |     ^~~~~~~~~~~~~
    13b7adb9
  • Alexandre Janniaux's avatar
    shout: fix deprecated shout_set_format function · 1acf4ffa
    Alexandre Janniaux authored and Steve Lhomme's avatar Steve Lhomme committed
    The version 2.4.3 added[^1] support for setting format usage, and codecs
    which deprecates the previous way of setting the format.
    The version 2.4.3 is currently available in bullseye (but not in buster).
    
    [^1]: https://github.com/xiph/Icecast-libshout/commit/0ac03fde3bf40c5c79eb2a77f0105742ed62c047
    
    Fixes the following warnings:
    
        ../../modules/access_output/shout.c:233:5: warning: ‘shout_set_format’ is deprecated: Use shout_set_content_format() [-Wdeprecated-declarations]
          233 |     i_ret = shout_set_format( p_shout, var_GetBool( p_access, SOUT_CFG_PREFIX "mp3" ) ?
              |     ^~~~~
        /usr/include/shout/shout.h:361:5: note: declared here
          361 | int shout_set_format(shout_t *self, unsigned int format) SHOUT_ATTR_F_DEPRECATED("Use shout_set_content_format()"); // obsolete
              |     ^~~~~~~~~~~~~~~~
    1acf4ffa
......@@ -2294,7 +2294,7 @@ PKG_CHECK_MODULES(LIBVORBIS, [vorbis >= 1.1], [
PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto], [${LIBVORBIS_CFLAGS}], [${LIBVORBIS_LIBS}])
if test "${enable_sout}" != "no"; then
dnl Check for libshout
PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.4.3], [libshout output plugin], [auto])
fi
dnl
......
4d4b958947e020de3330d49d39d59220fc89315f25f653a7456b9aa24ca9566fca30bb3d65e6348e79958656096b6b864ea8885157d24e55c8d84d6604670219 libshout-2.4.1.tar.gz
e8478cdbf9a27674c16a7b620d1576f2e31a47262b8e29b314d0f46d4e5be24b9a29790b7b226f48939bc34cacf5734fae0aa5686c7ed5879cdbd827ff8e0339 libshout-2.4.6.tar.gz
--- a/src/legacy.c 2022-04-10 12:10:14.000000000 +0200
+++ b/src/legacy.c 2022-09-14 16:16:30.000000000 +0200
@@ -28,6 +28,8 @@
#include "shout_private.h"
#include "util.h"
+#include <stdlib.h>
+
int shout_set_format(shout_t *self, unsigned int format)
{
if (!self)
--- a/src/icy.c 2022-04-10 12:10:14.000000000 +0200
+++ b/src/icy.c 2022-09-14 16:19:42.000000000 +0200
@@ -25,6 +25,8 @@
#include <stdbool.h>
#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
#include <shout/shout.h>
diff -ruN libshout/configure.ac libshout-new/configure.ac
--- libshout/configure.ac 2015-11-20 20:48:32.000000000 +0100
+++ libshout-new/configure.ac 2015-11-30 18:05:57.123213048 +0100
@@ -74,7 +74,7 @@
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_TIME
-AC_CHECK_HEADERS([strings.h sys/timeb.h])
+AC_CHECK_HEADERS([strings.h sys/timeb.h arpa/inet.h])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
diff -ruN libshout/src/proto_roaraudio.c libshout-new/src/proto_roaraudio.c
--- libshout/src/proto_roaraudio.c 2015-11-20 17:22:27.000000000 +0100
+++ libshout-new/src/proto_roaraudio.c 2015-11-30 18:06:41.823051979 +0100
@@ -28,7 +28,9 @@
#endif
/* for htonl(). */
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
--- libshout/Makefile.am.old 2018-11-22 12:46:19.971954640 +0100
+++ libshout/Makefile.am 2018-11-22 12:46:30.695954599 +0100
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = 1.6 foreign
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = include src examples doc win32
+SUBDIRS = include src win32
EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
# shout
SHOUT_VERSION := 2.4.1
SHOUT_VERSION := 2.4.6
SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
ifdef BUILD_ENCODERS
......@@ -8,7 +8,7 @@ ifdef BUILD_NETWORK
PKGS += shout
endif
endif
ifeq ($(call need_pkg,"shout >= 2.1"),)
ifeq ($(call need_pkg,"shout >= 2.4.3"),)
PKGS_FOUND += shout
endif
......@@ -20,15 +20,14 @@ $(TARBALLS)/libshout-$(SHOUT_VERSION).tar.gz:
# TODO: fix socket stuff on POSIX and Linux
libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(UNPACK)
$(APPLY) $(SRC)/shout/libshout-arpa.patch
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
$(APPLY) $(SRC)/shout/shout-strings.patch
$(APPLY) $(SRC)/shout/shout-timeval.patch
$(APPLY) $(SRC)/shout/shout-win32-socklen.patch
$(APPLY) $(SRC)/shout/no-examples.patch
$(APPLY) $(SRC)/shout/no-force-libwsock.patch
$(APPLY) $(SRC)/shout/should-win32-ws2tcpip.patch
$(APPLY) $(SRC)/shout/win32-gettimeofday.patch
$(APPLY) $(SRC)/shout/add-missing-stdlib-stdio.patch
$(call pkg_static,"shout.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
......@@ -36,7 +35,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
DEPS_shout = ogg $(DEPS_ogg) theora $(DEPS_theora) speex $(DEPS_speex)
DEPS_shout += vorbis $(DEPS_vorbis)
SHOUT_CONF :=
SHOUT_CONF := --disable-examples --disable-tools
ifdef HAVE_WIN32
SHOUT_CONF += "--disable-thread"
......
......@@ -10,27 +10,3 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
--- libshout/src/proto_http.c.strings 2015-11-20 17:22:27.000000000 +0100
+++ libshout/src/proto_http.c 2018-03-29 10:53:02.770498200 +0200
@@ -28,7 +28,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
#include <strings.h>
+#endif
#include <shout/shout.h>
#include "shout_private.h"
--- libshout/src/shout.c.strings 2015-11-09 12:54:12.000000000 +0100
+++ libshout/src/shout.c 2018-03-29 10:52:59.169968800 +0200
@@ -29,7 +29,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_STRINGS_H
#include <strings.h>
+#endif
#include <errno.h>
#include <shout/shout.h>
......@@ -208,10 +208,10 @@ static int Open( vlc_object_t *p_this )
|| shout_set_mount( p_shout, url.psz_path ) != SHOUTERR_SUCCESS
|| shout_set_user( p_shout, url.psz_username ) != SHOUTERR_SUCCESS
|| shout_set_agent( p_shout, "VLC media player " VERSION ) != SHOUTERR_SUCCESS
|| shout_set_name( p_shout, psz_name ) != SHOUTERR_SUCCESS
|| shout_set_description( p_shout, psz_description ) != SHOUTERR_SUCCESS
|| shout_set_genre( p_shout, psz_genre ) != SHOUTERR_SUCCESS
|| shout_set_url( p_shout, psz_url ) != SHOUTERR_SUCCESS
|| shout_set_meta( p_shout, SHOUT_META_NAME, psz_name ) != SHOUTERR_SUCCESS
|| shout_set_meta( p_shout, SHOUT_META_DESCRIPTION, psz_description ) != SHOUTERR_SUCCESS
|| shout_set_meta( p_shout, SHOUT_META_GENRE, psz_genre ) != SHOUTERR_SUCCESS
|| shout_set_meta( p_shout, SHOUT_META_URL, psz_url ) != SHOUTERR_SUCCESS
/* || shout_set_nonblocking( p_shout, 1 ) != SHOUTERR_SUCCESS */
)
{
......@@ -230,8 +230,10 @@ static int Open( vlc_object_t *p_this )
free( psz_genre );
free( psz_url );
i_ret = shout_set_format( p_shout, var_GetBool( p_access, SOUT_CFG_PREFIX "mp3" ) ?
SHOUT_FORMAT_MP3 : SHOUT_FORMAT_OGG );
unsigned format = var_GetBool( p_access, SOUT_CFG_PREFIX "mp3" ) ?
SHOUT_FORMAT_MP3 : SHOUT_FORMAT_OGG;
i_ret = shout_set_content_format( p_shout, format, SHOUT_USAGE_AUDIO, NULL );
if( i_ret != SHOUTERR_SUCCESS )
{
......