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)
......@@ -2217,17 +2217,29 @@ LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
*/
/**
* Audio channels
* Audio stereo modes
*/
typedef enum libvlc_audio_output_channel_t {
libvlc_AudioChannel_Error = -1,
libvlc_AudioChannel_Stereo = 1,
libvlc_AudioChannel_RStereo = 2,
libvlc_AudioChannel_Left = 3,
libvlc_AudioChannel_Right = 4,
libvlc_AudioChannel_Dolbys = 5
} libvlc_audio_output_channel_t;
typedef enum libvlc_audio_output_stereomode_t {
libvlc_AudioStereoMode_Unset = 0,
libvlc_AudioStereoMode_Stereo = 1,
libvlc_AudioStereoMode_RStereo = 2,
libvlc_AudioStereoMode_Left = 3,
libvlc_AudioStereoMode_Right = 4,
libvlc_AudioStereoMode_Dolbys = 5,
libvlc_AudioStereoMode_Mono = 7,
} libvlc_audio_output_stereomode_t;
/**
* Audio mix modes
*/
typedef enum libvlc_audio_output_mixmode_t {
libvlc_AudioMixMode_Unset = 0,
libvlc_AudioMixMode_Stereo = 1,
libvlc_AudioMixMode_Binaural = 2,
libvlc_AudioMixMode_4_0 = 3,
libvlc_AudioMixMode_5_1 = 4,
libvlc_AudioMixMode_7_1 = 5,
} libvlc_audio_output_mixmode_t;
/**
* Gets the list of available audio output modules.
......@@ -2409,21 +2421,59 @@ LIBVLC_API int libvlc_audio_get_volume( libvlc_media_player_t *p_mi );
LIBVLC_API int libvlc_audio_set_volume( libvlc_media_player_t *p_mi, int i_volume );
/**
* Get current audio channel.
* Get current audio stereo-mode.
*
* \param p_mi media player
* \return the audio stereo-mode, \see libvlc_audio_output_stereomode_t
* \version LibVLC 4.0.0 or later
*/
LIBVLC_API libvlc_audio_output_stereomode_t libvlc_audio_get_stereomode( libvlc_media_player_t *p_mi );
/**
* Set current audio stereo-mode.
*
* \param p_mi media player
* \param channel the audio stereo-mode, \see libvlc_audio_output_stereomode_t
* \return 0 on success, -1 on error
* \version LibVLC 4.0.0 or later
*/
LIBVLC_API int libvlc_audio_set_stereomode( libvlc_media_player_t *p_mi,
libvlc_audio_output_stereomode_t mode );
/**
* Get current audio mix-mode.
*
* \param p_mi media player
* \return the audio channel \see libvlc_audio_output_channel_t
* \return the audio mix-mode, \see libvlc_audio_output_mixmode_t
* \version LibVLC 4.0.0 or later
*/
LIBVLC_API int libvlc_audio_get_channel( libvlc_media_player_t *p_mi );
LIBVLC_API libvlc_audio_output_mixmode_t libvlc_audio_get_mixmode( libvlc_media_player_t *p_mi );
/**
* Set current audio channel.
* Set current audio mix-mode.
*
* By default (libvlc_AudioMixMode_Unset), the audio output will keep its
* original channel configuration (play stereo as stereo, or 5.1 as 5.1). Yet,
* the OS and Audio API might refuse a channel configuration and asks VLC to
* adapt (Stereo played as 5.1 or vice-versa).
*
* This function allows to force a channel configuration, it will only work if
* the OS and Audio API accept this configuration (otherwise, it won't have any
* effects). Here are some examples:
* - Play multi-channels (5.1, 7.1...) as stereo (libvlc_AudioMixMode_Stereo)
* - Play Stereo or 5.1 as 7.1 (libvlc_AudioMixMode_7_1)
* - Play multi-channels as stereo with a binaural effect
* (libvlc_AudioMixMode_Binaural). It might be selected automatically if the
* OS and Audio API can detect if a headphone is plugged.
*
* \param p_mi media player
* \param channel the audio channel, \see libvlc_audio_output_channel_t
* \param channel the audio mix-mode, \see libvlc_audio_output_mixmode_t
* \return 0 on success, -1 on error
* \version LibVLC 4.0.0 or later
*/
LIBVLC_API int libvlc_audio_set_channel( libvlc_media_player_t *p_mi, int channel );
LIBVLC_API int libvlc_audio_set_mixmode( libvlc_media_player_t *p_mi,
libvlc_audio_output_mixmode_t mode );
/**
* Get current audio delay.
......
......@@ -348,13 +348,13 @@ end:
}
/*****************************************************************************
* libvlc_audio_get_channel : Get the current audio channel
* libvlc_audio_get_stereomode : Get the current audio stereo-mode
*****************************************************************************/
int libvlc_audio_get_channel( libvlc_media_player_t *mp )
libvlc_audio_output_stereomode_t libvlc_audio_get_stereomode( libvlc_media_player_t *mp )
{
audio_output_t *p_aout = GetAOut( mp );
if( !p_aout )
return 0;
return libvlc_AudioStereoMode_Unset;
int val = var_GetInteger( p_aout, "stereo-mode" );
aout_Release(p_aout);
......@@ -362,19 +362,70 @@ int libvlc_audio_get_channel( libvlc_media_player_t *mp )
}
/*****************************************************************************
* libvlc_audio_set_channel : Set the current audio channel
* libvlc_audio_set_stereomode : Set the current audio stereo-mode
*****************************************************************************/
int libvlc_audio_set_channel( libvlc_media_player_t *mp, int channel )
int libvlc_audio_set_stereomode( libvlc_media_player_t *mp, libvlc_audio_output_stereomode_t mode )
{
static_assert(libvlc_AudioStereoMode_Unset == AOUT_VAR_CHAN_UNSET &&
libvlc_AudioStereoMode_Stereo == AOUT_VAR_CHAN_STEREO &&
libvlc_AudioStereoMode_RStereo == AOUT_VAR_CHAN_RSTEREO &&
libvlc_AudioStereoMode_Left == AOUT_VAR_CHAN_LEFT &&
libvlc_AudioStereoMode_Right == AOUT_VAR_CHAN_RIGHT &&
libvlc_AudioStereoMode_Dolbys == AOUT_VAR_CHAN_DOLBYS &&
libvlc_AudioStereoMode_Mono == AOUT_VAR_CHAN_MONO,
"Mismatch with stereo-mode LibVLC/VLC enums");
audio_output_t *p_aout = GetAOut( mp );
int ret = 0;
if( !p_aout )
return -1;
if( var_SetInteger( p_aout, "stereo-mode", mode ) < 0 )
{
libvlc_printerr( "Audio stereo-mode out of range" );
ret = -1;
}
aout_Release(p_aout);
return ret;
}
/*****************************************************************************
* libvlc_audio_get_mixmode : Get the current audio mix-mode
*****************************************************************************/
libvlc_audio_output_mixmode_t libvlc_audio_get_mixmode( libvlc_media_player_t *mp )
{
audio_output_t *p_aout = GetAOut( mp );
if( !p_aout )
return libvlc_AudioMixMode_Unset;
int val = var_GetInteger( p_aout, "mix-mode" );
aout_Release(p_aout);
return val;
}
/*****************************************************************************
* libvlc_audio_set_mixmode : Set the current audio mix-mode
*****************************************************************************/
int libvlc_audio_set_mixmode( libvlc_media_player_t *mp, libvlc_audio_output_mixmode_t mode )
{
static_assert(libvlc_AudioMixMode_Unset == AOUT_VAR_CHAN_UNSET &&
libvlc_AudioMixMode_Stereo == AOUT_MIX_MODE_STEREO &&
libvlc_AudioMixMode_Binaural == AOUT_MIX_MODE_BINAURAL &&
libvlc_AudioMixMode_4_0 == AOUT_MIX_MODE_4_0 &&
libvlc_AudioMixMode_5_1 == AOUT_MIX_MODE_5_1 &&
libvlc_AudioMixMode_7_1 == AOUT_MIX_MODE_7_1,
"Mismatch with mix-mode LibVLC/VLC enums");
audio_output_t *p_aout = GetAOut( mp );
int ret = 0;
if( !p_aout )
return -1;
if( var_SetInteger( p_aout, "stereo-mode", channel ) < 0 )
if( var_SetInteger( p_aout, "mix-mode", mode ) < 0 )
{
libvlc_printerr( "Audio channel out of range" );
libvlc_printerr( "Audio mix-mode out of range" );
ret = -1;
}
aout_Release(p_aout);
......
......@@ -19,14 +19,16 @@ libvlc_audio_output_device_set
libvlc_audio_output_list_get
libvlc_audio_output_list_release
libvlc_audio_output_set
libvlc_audio_get_channel
libvlc_audio_get_mixmode
libvlc_audio_get_stereomode
libvlc_audio_get_delay
libvlc_audio_get_mute
libvlc_audio_get_track
libvlc_audio_get_track_count
libvlc_audio_get_track_description
libvlc_audio_get_volume
libvlc_audio_set_channel
libvlc_audio_set_mixmode
libvlc_audio_set_stereomode
libvlc_audio_set_delay
libvlc_audio_set_mute
libvlc_audio_set_track
......