From b5622ce91307589b03ad5d903214b47ff2277e48 Mon Sep 17 00:00:00 2001 From: Scott Murray <scott.murray@konsulko.com> Date: Mon, 7 Mar 2022 15:51:15 -0500 Subject: Update for app framework removal Changes: - Remove the autobuild scripts and config.xml used by the app framework widget build. - Update the CMake files to just build a "qt-cluster-receiver" binary and install it into /usr/bin by default. - Remove the code in main.cpp that handled reading the WebSocket command-line arguments and passing them to binding related code. Also removed the now unnecessary port and token caching in surface.{hpp,cpp}. Bug-AGL: SPEC-4283 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I88979f6049212ff790014b9674a87c4c0a582ccb --- app/main.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'app/main.cpp') diff --git a/app/main.cpp b/app/main.cpp index b68aeac..f46baa0 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -154,8 +154,6 @@ drop: int main(int argc, char *argv[]) { - int port = 0; - std::string token; std::string role = "receiver"; QString my_role = "receiver"; @@ -175,17 +173,6 @@ int main(int argc, char *argv[]) gargv[0] = strdup(argv[0]); gargv[1] = strdup("--gst-debug-level=2"); - try { - port = std::stol(argv[1]); - token = argv[2]; - } catch (const std::invalid_argument& e) { - std::cerr << "Invalid argument" << std::endl; - exit(1); - } catch (const std::out_of_range& e) { - std::cerr << "Port out of range" << std::endl; - exit(1); - } - std::string pipeline_str = \ "rtpbin name=rtpbin udpsrc " "caps=\"application/x-rtp,media=(string)video,clock-rate=(int)90000,encoding-name=JPEG,payload=26\" " @@ -203,7 +190,7 @@ int main(int argc, char *argv[]) // mark the application id -> my_role app.setDesktopFileName(my_role); - SurfaceHandler handler(port, token, role); + SurfaceHandler handler(role); // we already have the app_id -> role this will set-up the x and y // position and a bounding box that will be used to clip out the -- cgit 1.2.3-korg