From fc1acb81c47fabb5d72a97f831d8b544a5ee9922 Mon Sep 17 00:00:00 2001 From: morro Date: Fri, 23 Nov 2018 10:13:20 +0100 Subject: [PATCH 1/2] improved autoplay --- src/gui/PageView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/PageView.cpp b/src/gui/PageView.cpp index 12a24dd7..1058abf6 100644 --- a/src/gui/PageView.cpp +++ b/src/gui/PageView.cpp @@ -382,7 +382,6 @@ void XojPageView::playObjectAt(double x, double y) string command( "vlc --qt-start-minimized " + audioFolder + fn + " --start-time=" + std::to_string(ts) + " &>/dev/null &"); - std::cout << "command: " << command << std::endl; system(command.c_str()); } } @@ -390,7 +389,8 @@ void XojPageView::playObjectAt(double x, double y) { string command( "curl -s -u \"\":\"password\" --url \"http://127.0.0.1:8080/requests/status.xml?command=seek&val=" - + std::to_string(ts) + "\" >/dev/null"); + + std::to_string(ts) + "\" >/dev/null" + + "&& curl -s -u \"\":\"password\" --url \"http://127.0.0.1:8080/requests/status.xml?command=pl_play\" >/dev/null"); system(command.c_str()); } } From ec649a686f2752d7bf232fae31035b143e8c9d01 Mon Sep 17 00:00:00 2001 From: morro Date: Fri, 23 Nov 2018 10:20:20 +0100 Subject: [PATCH 2/2] using psw variable + added TODO --- src/gui/PageView.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/PageView.cpp b/src/gui/PageView.cpp index 1058abf6..30388eb8 100644 --- a/src/gui/PageView.cpp +++ b/src/gui/PageView.cpp @@ -386,11 +386,13 @@ void XojPageView::playObjectAt(double x, double y) } } else - { + { + //TODO: substitute system(..) with some c++ curl library + string psw("password"); string command( - "curl -s -u \"\":\"password\" --url \"http://127.0.0.1:8080/requests/status.xml?command=seek&val=" + "curl -s -u \"\":\""+psw+"\" --url \"http://127.0.0.1:8080/requests/status.xml?command=seek&val=" + std::to_string(ts) + "\" >/dev/null" - + "&& curl -s -u \"\":\"password\" --url \"http://127.0.0.1:8080/requests/status.xml?command=pl_play\" >/dev/null"); + + "&& curl -s -u \"\":\""+psw+"\" --url \"http://127.0.0.1:8080/requests/status.xml?command=pl_play\" >/dev/null"); system(command.c_str()); } }