citrun

commit 25f9b03a0072503dd8cdab650fa52e5def87c1b1
parent d7bc435eccc0db5d79109b348e4dbefa2ad3d7d7
Author: Kyle Milz <kyle@0x30.net>
Date:   Sun, 11 Dec 2016 12:56:43 -0700

src: remove more unused functions

Diffstat:
M
src/gl_main.cc
 | 
10
----------
M
src/gl_view.cc
 | 
23
+++++------------------
M
src/gl_view.h
 | 
1
-

3 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/src/gl_main.cc b/src/gl_main.cc
@@ -63,13 +63,6 @@ motion_func(int x, int y)
 }
 
 void
-display(void)
-{
-	static_vu->display();
-}
-
-
-void
 add_new_process(std::string const &file_name)
 {
 	drawables.push_back(ProcessFile(file_name));
@@ -201,7 +194,6 @@ main(int argc, char *argv[])
 	glfwSetKeyCallback(window, keyboard_func);
 
 	// glutReshapeFunc(reshape_func);
-	// glutDisplayFunc(display);
 	// glutSpecialFunc(special_func);
 	// glutMouseFunc(mouse_func);
 	// glutMotionFunc(motion_func);
@@ -229,8 +221,6 @@ main(int argc, char *argv[])
 
 	static_vu->setup();
 
-	static_vu->toggle_animation();
-
 	glyphy_point_t top_left = { 0, 0 };
 	demo_buffer_move_to(buffer, &top_left);
 	demo_buffer_add_text(buffer, "waiting...", font, 1);
diff --git a/src/gl_view.cc b/src/gl_view.cc
@@ -147,16 +147,6 @@ current_time (void)
 }
 
 void
-View::toggle_animation()
-{
-#if 0
-	animate = !animate;
-	if (animate)
-		start_animation();
-#endif
-}
-
-void
 View::toggle_vsync()
 {
 	vsync = !vsync;
@@ -239,9 +229,6 @@ View::keyboard_func(GLFWwindow *window, int key, int scancode, int action, int m
 			glfwSetWindowShouldClose(window, 1);
 			break;
 
-		case ' ':
-			toggle_animation();
-			break;
 		case 'v':
 			toggle_vsync();
 			break;
@@ -288,23 +275,23 @@ View::keyboard_func(GLFWwindow *window, int key, int scancode, int action, int m
 			toggle_srgb();
 			break;
 
-		case '=':
+		case GLFW_KEY_EQUAL:
 			scale(STEP);
 			break;
 		case '-':
 			scale(1. / STEP);
 			break;
 
-		case 'k':
+		case GLFW_KEY_K:
 			translate(0, -.1);
 			break;
-		case 'j':
+		case GLFW_KEY_J:
 			translate(0, +.1);
 			break;
-		case 'h':
+		case GLFW_KEY_H:
 			translate(+.1, 0);
 			break;
-		case 'l':
+		case GLFW_KEY_L:
 			translate(-.1, 0);
 			break;
 
diff --git a/src/gl_view.h b/src/gl_view.h
@@ -28,7 +28,6 @@ public:
 	bool has_fps_timer;
 	long last_frame_time;
 
-	void toggle_animation();
 private:
 	void scale_gamma_adjust(double);
 	void scale_contrast(double);