summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/generic_players
diff options
context:
space:
mode:
authorRafael Antognolli <antognolli@gmail.com>2012-03-15 20:43:17 +0000
committerRafael Antognolli <antognolli@gmail.com>2012-03-15 20:43:17 +0000
commitddb6b7aab251f0c2098bf481662c57cb83644558 (patch)
treeeacc847ee74393df1c66b8fc3cf112c2ffbfb52c /legacy/emotion/src/generic_players
parent7248d7a9700989b4bdb4e5a017cfd19ce9fee377 (diff)
Don't abort when there's no video size.
For music, it does make sense to return -1. SVN revision: 69436
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
index 6d61451eec..f286da3580 100644
--- a/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
+++ b/legacy/emotion/src/generic_players/vlc/emotion_generic_vlc.c
@@ -214,7 +214,6 @@ _send_length_changed(struct _App *app, const struct libvlc_event_t *ev)
214 float length = ev->u.media_player_length_changed.new_length; 214 float length = ev->u.media_player_length_changed.new_length;
215 length /= 1000; 215 length /= 1000;
216 216
217 fprintf(stderr, "length changed: %0.3f\n", length);
218 _send_cmd_start(app, EM_RESULT_LENGTH_CHANGED); 217 _send_cmd_start(app, EM_RESULT_LENGTH_CHANGED);
219 SEND_CMD_PARAM(app, length); 218 SEND_CMD_PARAM(app, length);
220 _send_cmd_finish(app); 219 _send_cmd_finish(app);
@@ -685,7 +684,10 @@ _position_changed(struct _App *app)
685 unsigned int w, h; 684 unsigned int w, h;
686 r = libvlc_video_get_size(app->mp, 0, &w, &h); 685 r = libvlc_video_get_size(app->mp, 0, &w, &h);
687 if (r < 0) 686 if (r < 0)
688 return; 687 {
688 w = 1;
689 h = 1;
690 }
689 _send_resize(app, w, h); 691 _send_resize(app, w, h);
690 692
691 /* sending audio track info */ 693 /* sending audio track info */
@@ -750,8 +752,6 @@ main(int argc, const char *argv[])
750 app.em_read = atoi(argv[1]); 752 app.em_read = atoi(argv[1]);
751 app.em_write = atoi(argv[2]); 753 app.em_write = atoi(argv[2]);
752 754
753 fprintf(stderr, "reading commands from fd: %d, writing on fd: %d\n", app.em_read, app.em_write);
754
755 int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); 755 int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv);
756 snprintf(cwidth, sizeof(cwidth), "%d", DEFAULTWIDTH); 756 snprintf(cwidth, sizeof(cwidth), "%d", DEFAULTWIDTH);
757 snprintf(cheight, sizeof(cheight), "%d", DEFAULTHEIGHT); 757 snprintf(cheight, sizeof(cheight), "%d", DEFAULTHEIGHT);