diff options
Diffstat (limited to 'src/plugins/vlc_extractor.c')
-rw-r--r-- | src/plugins/vlc_extractor.c | 47 |
1 files changed, 9 insertions, 38 deletions
diff --git a/src/plugins/vlc_extractor.c b/src/plugins/vlc_extractor.c index ab9dfb2..922da0f 100644 --- a/src/plugins/vlc_extractor.c +++ b/src/plugins/vlc_extractor.c | |||
@@ -17,7 +17,7 @@ | |||
17 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
18 | Boston, MA 02110-1301, USA. | 18 | Boston, MA 02110-1301, USA. |
19 | 19 | ||
20 | NOTE: This plugin is not yet working. Somehow libvlc never calls any of the IO callbacks. | 20 | THIS PLUGIN IS NOT WORKING, see #2075! |
21 | 21 | ||
22 | */ | 22 | */ |
23 | /** | 23 | /** |
@@ -273,10 +273,12 @@ my_logger (void *data, | |||
273 | const char *fmt, | 273 | const char *fmt, |
274 | va_list args) | 274 | va_list args) |
275 | { | 275 | { |
276 | #if 0 | ||
276 | vfprintf (stderr, | 277 | vfprintf (stderr, |
277 | fmt, | 278 | fmt, |
278 | args); | 279 | args); |
279 | fprintf (stderr, "\n"); | 280 | fprintf (stderr, "\n"); |
281 | #endif | ||
280 | } | 282 | } |
281 | 283 | ||
282 | 284 | ||
@@ -314,35 +316,12 @@ EXTRACTOR_vlc_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
314 | libvlc_log_set (vlc, | 316 | libvlc_log_set (vlc, |
315 | &my_logger, | 317 | &my_logger, |
316 | NULL); | 318 | NULL); |
317 | if (0) | 319 | media = libvlc_media_new_callbacks (vlc, |
318 | { | 320 | &open_cb, |
319 | fprintf (stderr, | 321 | &read_cb, |
320 | "Opening file `%s'\n", | 322 | &seek_cb, |
321 | "testdata/matroska_flame.mkv"); | 323 | &close_cb, |
322 | int fd = open ("testdata/matroska_flame.mkv", | 324 | ec); |
323 | O_RDONLY); | ||
324 | if (-1 == fd) | ||
325 | { | ||
326 | fprintf (stderr, | ||
327 | "Open failed: %s\n", | ||
328 | strerror (errno)); | ||
329 | libvlc_release (vlc); | ||
330 | return; | ||
331 | } | ||
332 | media = libvlc_media_new_fd (vlc, | ||
333 | fd); | ||
334 | } | ||
335 | else | ||
336 | { | ||
337 | fprintf (stderr, | ||
338 | "Reading via IPC\n"); | ||
339 | media = libvlc_media_new_callbacks (vlc, | ||
340 | &open_cb, | ||
341 | &read_cb, | ||
342 | &seek_cb, | ||
343 | &close_cb, | ||
344 | ec); | ||
345 | } | ||
346 | if (NULL == media) | 325 | if (NULL == media) |
347 | { | 326 | { |
348 | libvlc_release (vlc); | 327 | libvlc_release (vlc); |
@@ -354,8 +333,6 @@ EXTRACTOR_vlc_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
354 | libvlc_MediaParsedChanged, | 333 | libvlc_MediaParsedChanged, |
355 | &media_ready, | 334 | &media_ready, |
356 | ec); | 335 | ec); |
357 | fprintf (stderr, | ||
358 | "Triggering parser\n"); | ||
359 | { | 336 | { |
360 | int status; | 337 | int status; |
361 | 338 | ||
@@ -364,13 +341,7 @@ EXTRACTOR_vlc_extract_method (struct EXTRACTOR_ExtractContext *ec) | |||
364 | | libvlc_media_parse_network | 341 | | libvlc_media_parse_network |
365 | | libvlc_media_fetch_network, | 342 | | libvlc_media_fetch_network, |
366 | 30000); /* 30s timeout */ | 343 | 30000); /* 30s timeout */ |
367 | fprintf (stderr, | ||
368 | "Status: %d\n", | ||
369 | status); | ||
370 | } | 344 | } |
371 | fprintf (stderr, | ||
372 | "Sleeping\n"); | ||
373 | sleep (1); | ||
374 | extract (ec, | 345 | extract (ec, |
375 | media); | 346 | media); |
376 | libvlc_media_release (media); | 347 | libvlc_media_release (media); |