x11 capture

Author: dsheeler

Makefile

@@ -16,7 +16,7 @@ LFLAGS = $(shell pkg-config --libs cairo) \
 				 $(shell pkg-config --libs fftw3) \
 				 $(shell pkg-config --libs glib-2.0 libcanberra) \
 				 -lccv -lm -lpng -ljpeg -lswscale -lavutil -lswresample \
-				 -lavformat -lavcodec -lpthread -ljack
+				 -lavformat -lavcodec -lpthread -ljack -lX11
 LIBS =
 #CFLAGS = -O3 -ffast-math -Wall
 CFLAGS =-g -Wall
@@ -25,16 +25,16 @@ CFLAGS +=	$(shell pkg-config --cflags pangocairo) \
 				 	$(shell pkg-config --cflags fftw3) \
 					$(shell pkg-config --cflags glib-2.0 libcanberra)
 
-SRCS = drawable.cc v4l2_wayland.cc muxing.cc sound_shape.cc midi.cc kmeter.cc \
+SRCS = vwdrawable.cc v4l2_wayland.cc sound_shape.cc midi.cc kmeter.cc \
 			 video_file_source.cc dingle_dots.cc v4l2.cc sprite.cc snapshot_shape.cc \
-			 easer.cc easable.cc video_file_out.cc
+			 easer.cc easable.cc video_file_out.cc x11.cc
 CSRCS= easing.c
 
 OBJS := $(SRCS:.cc=.o) $(CSRCS:.c=.o)
 
-HDRS = drawable.h muxing.h sound_shape.h midi.h v4l2_wayland.h kmeter.h \
+HDRS = vwdrawable.h sound_shape.h midi.h v4l2_wayland.h kmeter.h \
 			video_file_source.h dingle_dots.h v4l2.h sprite.h snapshot_shape.h \
-			easer.h easing.h easable.h video_file_out.h
+			easer.h easing.h easable.h video_file_out.h x11.h
 
 .SUFFIXES:
 

dingle_dots.cc

@@ -55,7 +55,7 @@ int DingleDots::init(int width, int height) {
 	color_init(&c2, 0.0, 0.2, 0.1, 1.0);
 	this->meters[0].init(this, sr, bufsize, 0.1f, 20.0f, width/2 - 2*w, height/2, w, c1);
 	this->meters[1].init(this, sr, bufsize, 0.1f, 20.0f, width/2 + 2*w, height/2, w, c2);
-
+	this->x11.create(this);
 	snapshot_shape.init("SNAPSHOT", this->drawing_rect.width / 2., this->drawing_rect.width / 16.,
 						this->drawing_rect.width / 32., random_color(), this);
 
@@ -90,7 +90,16 @@ double hanning_window(int i, int N) {
 }
 
 int process(jack_nframes_t nframes, void *arg) {
+	static int first_call = 1;
 	DingleDots *dd = (DingleDots *)arg;
+	if (first_call) {
+		first_call = 0;
+		int rc = pthread_setname_np(pthread_self(), "vw_audio");
+		if (rc != 0) {
+			errno = rc;
+			perror("pthread_setname_np");
+		}
+	}
 	if (!dd->can_process) return 0;
 	midi_process_output(nframes, dd);
 	for (int chn = 0; chn < dd->nports; chn++) {
@@ -337,7 +346,7 @@ int DingleDots::add_note(char *scale_name,
 	return -1;
 }
 
-void DingleDots::get_sound_shapes(std::vector<Drawable *> &sound_shapes)
+void DingleDots::get_sound_shapes(std::vector<vwDrawable *> &sound_shapes)
 {
 	for (int i = 0; i < MAX_NUM_SOUND_SHAPES; ++i) {
 		SoundShape *ss = &this->sound_shapes[i];
@@ -350,8 +359,11 @@ void DingleDots::get_sound_shapes(std::vector<Drawable *> &sound_shapes)
 	//sound_shapes.push_back(&this->snapshot_shape);
 }
 
-void DingleDots::get_sources(std::vector<Drawable *> &list)
+void DingleDots::get_sources(std::vector<vwDrawable *> &list)
 {
+	if (this->x11.active) {
+		list.push_back(&this->x11);
+	}
 	for (int i = 0; i < MAX_NUM_V4L2; i++) {
 		if (this->v4l2[i].active) {
 			list.push_back(&this->v4l2[i]);

dingle_dots.h

@@ -26,6 +26,7 @@ typedef struct midi_key_t midi_key_t;
 #include "sprite.h"
 #include "easable.h"
 #include "video_file_out.h"
+#include "x11.h"
 
 #define STR_LEN 80
 #define MAX_NUM_V4L2 4
@@ -70,6 +71,7 @@ class DingleDots : public Easable {
 	int current_sprite_index;
 	V4l2 v4l2[MAX_NUM_V4L2];
 	Sprite sprites[MAX_NUM_SPRITES];
+	X11 x11;
 	SnapshotShape snapshot_shape;
 	SoundShape sound_shapes[MAX_NUM_SOUND_SHAPES];
 	Meter meters[2];
@@ -85,6 +87,7 @@ class DingleDots : public Easable {
 	double ascale_factor_x;
 	double ascale_factor_y;
 	GdkRectangle selection_rect;
+
 	uint64_t next_z;
 	GdkPoint mouse_pos;
 	uint8_t mdown;
@@ -118,8 +121,8 @@ class DingleDots : public Easable {
 	color random_color();
 	uint8_t get_animating() const;
 	void set_animating(const uint8_t &value);
-	void get_sound_shapes(std::vector<Drawable *> &sound_shapes);
-	void get_sources(std::vector<Drawable *> &list);
+	void get_sound_shapes(std::vector<vwDrawable *> &sound_shapes);
+	void get_sources(std::vector<vwDrawable *> &list);
 	double get_selection_box_alpha() const;
 	void set_selection_box_alpha(double value);
 	void render_selection_box(cairo_t *cr);

easer.cc

@@ -3,7 +3,7 @@
 #include "easer.h"
 #include "v4l2_wayland.h"
 #include "dingle_dots.h"
-#include "drawable.h"
+#include "vwdrawable.h"
 
 Easer::Easer() {}
 

easer.h

@@ -43,7 +43,7 @@ typedef enum {
 } Easer_Type;
 
 class DingleDots;
-class Drawable;
+class vwDrawable;
 class Easable;
 typedef AHFloat (*EasingFuncPtr)(AHFloat);
 class Easer {