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 (10)
Showing
with 59 additions and 84 deletions
......@@ -194,12 +194,12 @@ QtVLCWidget::QtVLCWidget(QWidget *parent)
bool QtVLCWidget::playMedia(const char* url)
{
m_media = libvlc_media_new_location (m_vlc, url);
m_media = libvlc_media_new_location(url);
if (m_media == nullptr) {
fprintf(stderr, "unable to create media %s", url);
return false;
}
m_mp = libvlc_media_player_new_from_media (m_media);
m_mp = libvlc_media_player_new_from_media (m_vlc, m_media);
if (m_mp == nullptr) {
fprintf(stderr, "unable to create media player");
libvlc_media_release(m_media);
......
......@@ -132,12 +132,12 @@ void Mwindow::openFile() {
stop();
/* Create a new Media */
libvlc_media_t *vlcMedia = libvlc_media_new_path(vlcInstance, qtu(fileOpen));
libvlc_media_t *vlcMedia = libvlc_media_new_path(qtu(fileOpen));
if (!vlcMedia)
return;
/* Create a new libvlc player */
vlcPlayer = libvlc_media_player_new_from_media (vlcMedia);
vlcPlayer = libvlc_media_player_new_from_media (vlcInstance, vlcMedia);
/* Release the media */
libvlc_media_release(vlcMedia);
......
......@@ -82,7 +82,7 @@
NSArray *args = [[NSProcessInfo processInfo] arguments];
NSString *location = [args objectAtIndex:1];
media = libvlc_media_new_location(instance, [location UTF8String]);
media = libvlc_media_new_location([location UTF8String]);
libvlc_media_player_set_media(player, media);
libvlc_media_player_set_nsobject(player, (__bridge void*)_view);
......
......@@ -637,9 +637,9 @@ int WINAPI WinMain(HINSTANCE hInstance,
file_path = _strdup( lpCmdLine );
p_libvlc = libvlc_new( 0, NULL );
p_media = libvlc_media_new_path( p_libvlc, file_path );
p_media = libvlc_media_new_path( file_path );
free( file_path );
Context.p_mp = libvlc_media_player_new_from_media( p_media );
Context.p_mp = libvlc_media_player_new_from_media( p_libvlc, p_media );
InitializeSRWLock(&Context.sizeLock);
InitializeSRWLock(&Context.swapchainLock);
......
......@@ -375,9 +375,9 @@ int WINAPI WinMain(HINSTANCE hInstance,
file_path = _strdup( lpCmdLine );
p_libvlc = libvlc_new( 0, NULL );
p_media = libvlc_media_new_path( p_libvlc, file_path );
p_media = libvlc_media_new_path( file_path );
free( file_path );
Context.p_mp = libvlc_media_player_new_from_media( p_media );
Context.p_mp = libvlc_media_player_new_from_media( p_libvlc, p_media );
InitializeCriticalSection(&Context.sizeLock);
......
......@@ -17,11 +17,11 @@ int main(int argc, char* argv[])
inst = libvlc_new (0, NULL);
/* Create a new item */
m = libvlc_media_new_location (inst, "http://mycool.movie.com/test.mov");
//m = libvlc_media_new_path (inst, "/path/to/test.mov");
m = libvlc_media_new_location("http://mycool.movie.com/test.mov");
//m = libvlc_media_new_path("/path/to/test.mov");
/* Create a media player playing environement */
mp = libvlc_media_player_new_from_media (m);
mp = libvlc_media_player_new_from_media (inst, m);
/* No need to keep the media now */
libvlc_media_release (m);
......
......@@ -45,7 +45,7 @@ void on_open(GtkWidget *widget, gpointer data) {
void open_media(const char* uri) {
libvlc_media_t *media;
media = libvlc_media_new_location(vlc_inst, uri);
media = libvlc_media_new_location(uri);
libvlc_media_player_set_media(media_player, media);
play();
libvlc_media_release(media);
......
......@@ -67,12 +67,12 @@ public:
bool playMedia(const char* url)
{
m_media = libvlc_media_new_location (m_vlc, url);
m_media = libvlc_media_new_location(url);
if (m_media == NULL) {
fprintf(stderr, "unable to create media %s", url);
return false;
}
m_mp = libvlc_media_player_new_from_media (m_media);
m_mp = libvlc_media_player_new_from_media (m_vlc, m_media);
if (m_mp == NULL) {
fprintf(stderr, "unable to create media player");
libvlc_media_release(m_media);
......
......@@ -189,7 +189,7 @@ int main(int argc, const char **argv)
libvlc = create_libvlc();
assert(libvlc);
m = libvlc_media_new_path(libvlc, in);
m = libvlc_media_new_path(in);
assert(m);
/* takes snapshot */
......
......@@ -45,7 +45,7 @@ static LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
if (DragQueryFile(hDrop, 0, file_path, sizeof(file_path)))
{
libvlc_media_t *p_media = libvlc_media_new_path( ctx->p_libvlc, file_path );
libvlc_media_t *p_media = libvlc_media_new_path( file_path );
libvlc_media_t *p_old_media = libvlc_media_player_get_media( ctx->p_mediaplayer );
libvlc_media_player_set_media( ctx->p_mediaplayer, p_media );
libvlc_media_release( p_old_media );
......@@ -116,9 +116,10 @@ int WINAPI WinMain(HINSTANCE hInstance,
file_path = _strdup( lpCmdLine );
Context.p_libvlc = libvlc_new( 0, NULL );
p_media = libvlc_media_new_path( Context.p_libvlc, file_path );
p_media = libvlc_media_new_path( file_path );
free( file_path );
Context.p_mediaplayer = libvlc_media_player_new_from_media( p_media );
Context.p_mediaplayer = libvlc_media_player_new_from_media(
Context.p_libvlc, p_media );
ZeroMemory(&wc, sizeof(WNDCLASSEX));
......
......@@ -154,7 +154,7 @@ void MainWindow::OnOpen(wxCommandEvent& event) {
libvlc_media_t *media;
wxFileName filename = wxFileName::FileName(openFileDialog.GetPath());
filename.MakeRelativeTo();
media = libvlc_media_new_path(vlc_inst, filename.GetFullPath().mb_str());
media = libvlc_media_new_path(filename.GetFullPath().mb_str());
libvlc_media_player_set_media(media_player, media);
play();
libvlc_media_release(media);
......
......@@ -276,26 +276,20 @@ typedef void (*libvlc_media_close_cb)(void *opaque);
*
* \see libvlc_media_release
*
* \param p_instance the instance
* \param psz_mrl the media location
* \return the newly created media or NULL on error
*/
LIBVLC_API libvlc_media_t *libvlc_media_new_location(
libvlc_instance_t *p_instance,
const char * psz_mrl );
LIBVLC_API libvlc_media_t *libvlc_media_new_location(const char * psz_mrl);
/**
* Create a media for a certain file path.
*
* \see libvlc_media_release
*
* \param p_instance the instance
* \param path local filesystem path
* \return the newly created media or NULL on error
*/
LIBVLC_API libvlc_media_t *libvlc_media_new_path(
libvlc_instance_t *p_instance,
const char *path );
LIBVLC_API libvlc_media_t *libvlc_media_new_path(const char *path);
/**
* Create a media for an already open file descriptor.
......@@ -317,18 +311,14 @@ LIBVLC_API libvlc_media_t *libvlc_media_new_path(
*
* \version LibVLC 1.1.5 and later.
*
* \param p_instance the instance
* \param fd open file descriptor
* \return the newly created media or NULL on error
*/
LIBVLC_API libvlc_media_t *libvlc_media_new_fd(
libvlc_instance_t *p_instance,
int fd );
LIBVLC_API libvlc_media_t *libvlc_media_new_fd(int fd);
/**
* Create a media with custom callbacks to read the data from.
*
* \param instance LibVLC instance
* \param open_cb callback to open the custom bitstream input media
* \param read_cb callback to read data (must not be NULL)
* \param seek_cb callback to seek, or NULL if seeking is not supported
......@@ -352,7 +342,6 @@ LIBVLC_API libvlc_media_t *libvlc_media_new_fd(
* \version LibVLC 3.0.0 and later.
*/
LIBVLC_API libvlc_media_t *libvlc_media_new_callbacks(
libvlc_instance_t *instance,
libvlc_media_open_cb open_cb,
libvlc_media_read_cb read_cb,
libvlc_media_seek_cb seek_cb,
......@@ -364,13 +353,10 @@ LIBVLC_API libvlc_media_t *libvlc_media_new_callbacks(
*
* \see libvlc_media_release
*
* \param p_instance the instance
* \param psz_name the name of the node
* \return the new empty media or NULL on error
*/
LIBVLC_API libvlc_media_t *libvlc_media_new_as_node(
libvlc_instance_t *p_instance,
const char * psz_name );
LIBVLC_API libvlc_media_t *libvlc_media_new_as_node(const char * psz_name);
/**
* Add an option to the media.
......
......@@ -167,12 +167,13 @@ LIBVLC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t *p
/**
* Create a Media Player object from a Media
*
* \param inst LibVLC instance to create a media player with
* \param p_md the media. Afterwards the p_md can be safely
* destroyed.
* \return a new media player object, or NULL on error.
* It must be released by libvlc_media_player_release().
*/
LIBVLC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_media_t *p_md );
LIBVLC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_instance_t *inst, libvlc_media_t *p_md );
/**
* Release a media_player after use
......
......@@ -162,8 +162,7 @@ static libvlc_media_t *input_item_add_subitem( libvlc_media_t *p_md,
libvlc_media_list_t *p_subitems;
libvlc_event_t event;
p_md_child = libvlc_media_new_from_input_item( p_md->p_libvlc_instance,
item );
p_md_child = libvlc_media_new_from_input_item( item );
/* Add this to our media list */
p_subitems = media_get_subitems( p_md, true );
......@@ -468,9 +467,7 @@ static void uninstall_input_item_observer( libvlc_media_t *p_md )
*
* That's the generic constructor
*/
libvlc_media_t * libvlc_media_new_from_input_item(
libvlc_instance_t *p_instance,
input_item_t *p_input_item )
libvlc_media_t * libvlc_media_new_from_input_item(input_item_t *p_input_item )
{
libvlc_media_t * p_md;
......@@ -487,7 +484,6 @@ libvlc_media_t * libvlc_media_new_from_input_item(
return NULL;
}
p_md->p_libvlc_instance = p_instance;
p_md->p_input_item = p_input_item;
vlc_atomic_rc_init(&p_md->rc);
......@@ -505,14 +501,11 @@ libvlc_media_t * libvlc_media_new_from_input_item(
input_item_Hold( p_md->p_input_item );
install_input_item_observer( p_md );
libvlc_retain( p_instance );
return p_md;
}
// Create a media with a certain given media resource location
libvlc_media_t *libvlc_media_new_location( libvlc_instance_t *p_instance,
const char * psz_mrl )
libvlc_media_t *libvlc_media_new_location(const char * psz_mrl)
{
input_item_t * p_input_item;
libvlc_media_t * p_md;
......@@ -525,7 +518,7 @@ libvlc_media_t *libvlc_media_new_location( libvlc_instance_t *p_instance,
return NULL;
}
p_md = libvlc_media_new_from_input_item( p_instance, p_input_item );
p_md = libvlc_media_new_from_input_item( p_input_item );
/* The p_input_item is retained in libvlc_media_new_from_input_item */
input_item_Release( p_input_item );
......@@ -534,8 +527,7 @@ libvlc_media_t *libvlc_media_new_location( libvlc_instance_t *p_instance,
}
// Create a media for a certain file path
libvlc_media_t *libvlc_media_new_path( libvlc_instance_t *p_instance,
const char *path )
libvlc_media_t *libvlc_media_new_path(const char *path)
{
char *mrl = vlc_path2uri( path, NULL );
if( unlikely(mrl == NULL) )
......@@ -544,29 +536,28 @@ libvlc_media_t *libvlc_media_new_path( libvlc_instance_t *p_instance,
return NULL;
}
libvlc_media_t *m = libvlc_media_new_location( p_instance, mrl );
libvlc_media_t *m = libvlc_media_new_location(mrl);
free( mrl );
return m;
}
// Create a media for an already open file descriptor
libvlc_media_t *libvlc_media_new_fd( libvlc_instance_t *p_instance, int fd )
libvlc_media_t *libvlc_media_new_fd(int fd)
{
char mrl[16];
snprintf( mrl, sizeof(mrl), "fd://%d", fd );
return libvlc_media_new_location( p_instance, mrl );
return libvlc_media_new_location(mrl);
}
// Create a media with custom callbacks to read the data from
libvlc_media_t *libvlc_media_new_callbacks(libvlc_instance_t *p_instance,
libvlc_media_open_cb open_cb,
libvlc_media_t *libvlc_media_new_callbacks(libvlc_media_open_cb open_cb,
libvlc_media_read_cb read_cb,
libvlc_media_seek_cb seek_cb,
libvlc_media_close_cb close_cb,
void *opaque)
{
libvlc_media_t *m = libvlc_media_new_location(p_instance, "imem://");
libvlc_media_t *m = libvlc_media_new_location("imem://");
if (unlikely(m == NULL))
return NULL;
......@@ -580,8 +571,7 @@ libvlc_media_t *libvlc_media_new_callbacks(libvlc_instance_t *p_instance,
}
// Create a media as an empty node with a given name
libvlc_media_t * libvlc_media_new_as_node( libvlc_instance_t *p_instance,
const char * psz_name )
libvlc_media_t * libvlc_media_new_as_node(const char *psz_name)
{
input_item_t * p_input_item;
libvlc_media_t * p_md;
......@@ -595,7 +585,7 @@ libvlc_media_t * libvlc_media_new_as_node( libvlc_instance_t *p_instance,
return NULL;
}
p_md = libvlc_media_new_from_input_item( p_instance, p_input_item );
p_md = libvlc_media_new_from_input_item( p_input_item );
input_item_Release( p_input_item );
p_subitems = media_get_subitems( p_md, true );
......@@ -647,7 +637,6 @@ void libvlc_media_release( libvlc_media_t *p_md )
input_item_Release( p_md->p_input_item );
libvlc_event_manager_destroy( &p_md->event_manager );
libvlc_release( p_md->p_libvlc_instance );
free( p_md );
}
......@@ -666,7 +655,7 @@ libvlc_media_duplicate( libvlc_media_t *p_md_orig )
input_item_t *dup = input_item_Copy( p_md_orig->p_input_item );
if( dup == NULL )
return NULL;
return libvlc_media_new_from_input_item( p_md_orig->p_libvlc_instance, dup );
return libvlc_media_new_from_input_item( dup );
}
// Get mrl from a media descriptor object
......
......@@ -65,8 +65,7 @@ static void services_discovery_item_added( services_discovery_t *sd,
libvlc_media_discoverer_t *p_mdis = sd->owner.sys;
libvlc_media_list_t * p_mlist = p_mdis->p_mlist;
p_md = libvlc_media_new_from_input_item( p_mdis->p_libvlc_instance,
p_item );
p_md = libvlc_media_new_from_input_item( p_item );
if( parent != NULL )
{
......@@ -82,7 +81,7 @@ static void services_discovery_item_added( services_discovery_t *sd,
if( p_mlist == kVLCDictionaryNotFound )
{
libvlc_media_t * p_catmd;
p_catmd = libvlc_media_new_as_node( p_mdis->p_libvlc_instance, psz_cat );
p_catmd = libvlc_media_new_as_node( psz_cat );
p_mlist = libvlc_media_subitems( p_catmd );
p_mlist->b_read_only = true;
......
......@@ -37,7 +37,6 @@ struct libvlc_media_t
libvlc_event_manager_t event_manager;
input_item_t *p_input_item;
libvlc_instance_t *p_libvlc_instance;
vlc_atomic_rc_t rc;
VLC_FORWARD_DECLARE_OBJECT(libvlc_media_list_t*) p_subitems; /* A media descriptor can have Sub items. This is the only dependency we really have on media_list */
......@@ -54,8 +53,7 @@ struct libvlc_media_t
};
/* Media Descriptor */
libvlc_media_t * libvlc_media_new_from_input_item(
libvlc_instance_t *, input_item_t * );
libvlc_media_t * libvlc_media_new_from_input_item( input_item_t * );
void libvlc_media_add_subtree(libvlc_media_t *, input_item_node_t *);
......
......@@ -769,11 +769,12 @@ error1:
* Create a Media Instance object with a media descriptor.
**************************************************************************/
libvlc_media_player_t *
libvlc_media_player_new_from_media( libvlc_media_t * p_md )
libvlc_media_player_new_from_media( libvlc_instance_t *inst,
libvlc_media_t * p_md )
{
libvlc_media_player_t * p_mi;
p_mi = libvlc_media_player_new( p_md->p_libvlc_instance );
p_mi = libvlc_media_player_new( inst );
if( !p_mi )
return NULL;
......
......@@ -19,9 +19,9 @@
* http://www.gnu.org/copyleft/gpl.html *
**********************************************************************/
static void* media_list_add_file_path(libvlc_instance_t *vlc, libvlc_media_list_t *ml, const char * file_path)
static void* media_list_add_file_path(libvlc_media_list_t *ml, const char * file_path)
{
libvlc_media_t *md = libvlc_media_new_location (vlc, file_path);
libvlc_media_t *md = libvlc_media_new_location(file_path);
libvlc_media_list_add_media (ml, md);
libvlc_media_release (md);
return md;
......
......@@ -113,9 +113,9 @@ static void test_media_preparsed(libvlc_instance_t *vlc, const char *path,
libvlc_media_t *media;
if (path != NULL)
media = libvlc_media_new_path (vlc, path);
media = libvlc_media_new_path(path);
else
media = libvlc_media_new_location (vlc, location);
media = libvlc_media_new_location(location);
assert (media != NULL);
vlc_sem_t sem;
......@@ -278,7 +278,7 @@ static void test_media_subitems_media(libvlc_instance_t *vlc,
* file to force parsing. */
libvlc_event_attach (em, libvlc_MediaSubItemTreeAdded, subitem_parse_ended, &sem);
libvlc_media_player_t *mp = libvlc_media_player_new_from_media (media);
libvlc_media_player_t *mp = libvlc_media_player_new_from_media(vlc, media);
assert (mp);
assert (libvlc_media_player_play (mp) != -1);
vlc_sem_wait (&sem);
......@@ -311,7 +311,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
libvlc_media_t *media;
test_log ("Testing media_subitems: path: '%s'\n", subitems_path);
media = libvlc_media_new_path (vlc, subitems_path);
media = libvlc_media_new_path(subitems_path);
assert (media != NULL);
test_media_subitems_media(vlc, media, false, true);
libvlc_media_release (media);
......@@ -324,7 +324,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
char *location;
assert (asprintf (&location, "%s%s", schemes[i], subitems_realpath) != -1);
test_log ("Testing media_subitems: location: '%s'\n", location);
media = libvlc_media_new_location (vlc, location);
media = libvlc_media_new_location(location);
assert (media != NULL);
test_media_subitems_media(vlc, media, false, true);
free (location);
......@@ -337,7 +337,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
int fd = open (subitems_path, O_RDONLY);
test_log ("Testing media_subitems: fd: '%d'\n", fd);
assert (fd >= 0);
media = libvlc_media_new_fd (vlc, fd);
media = libvlc_media_new_fd(fd);
assert (media != NULL);
test_media_subitems_media(vlc, media, true, true);
libvlc_media_release (media);
......@@ -347,7 +347,7 @@ static void test_media_subitems(libvlc_instance_t *vlc)
#endif
test_log ("Testing media_subitems failure\n");
media = libvlc_media_new_location (vlc, "wrongfile://test");
media = libvlc_media_new_location("wrongfile://test");
assert (media != NULL);
test_media_subitems_media(vlc, media, false, false);
libvlc_media_release (media);
......
......@@ -37,11 +37,11 @@ static void test_media_list (const char ** argv, int argc)
ml = libvlc_media_list_new();
assert (ml != NULL);
md1 = libvlc_media_new_path (vlc, "/dev/null");
md1 = libvlc_media_new_path("/dev/null");
assert (md1 != NULL);
md2 = libvlc_media_new_path (vlc, "/dev/null");
md2 = libvlc_media_new_path("/dev/null");
assert (md2 != NULL);
md3 = libvlc_media_new_path (vlc, "/dev/null");
md3 = libvlc_media_new_path("/dev/null");
assert (md3 != NULL);
ret = libvlc_media_list_add_media (ml, md1);
......@@ -106,7 +106,7 @@ static void test_media_list (const char ** argv, int argc)
p_non_exist = libvlc_media_list_item_at_index (ml, -1);
assert (p_non_exist == NULL);
md4 = libvlc_media_new_path (vlc, "/dev/null");
md4 = libvlc_media_new_path("/dev/null");
assert (md4 != NULL);
/* try to find non inserted item */
......