Skip to content

Commit 583c2c2

Browse files
neilcsmith-netneilcsmith-net
committed
Remove non-functional org.freedesktop.gstreamer.controller.* classes and comment out lowlevel mappings where required pending review.
1 parent 48088e5 commit 583c2c2

File tree

7 files changed

+208
-335
lines changed

7 files changed

+208
-335
lines changed

‎src/org/freedesktop/gstreamer/controller/ControlSource.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/org/freedesktop/gstreamer/controller/InterpolationControlSource.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/org/freedesktop/gstreamer/controller/LFOControlSource.java‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/org/freedesktop/gstreamer/lowlevel/GstControlSourceAPI.java‎

Lines changed: 88 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.freedesktop.gstreamer.lowlevel;
2020

2121
import org.freedesktop.gstreamer.ClockTime;
22-
import org.freedesktop.gstreamer.controller.ControlSource;
22+
//import org.freedesktop.gstreamer.controller.ControlSource;
2323
import org.freedesktop.gstreamer.lowlevel.GObjectAPI.GParamSpec;
2424
import org.freedesktop.gstreamer.lowlevel.GValueAPI.GValue;
2525

@@ -37,90 +37,93 @@
3737
* GstControlSource methods and structures
3838
* @see https://cgit.freedesktop.org/gstreamer/gstreamer/tree/gst/gstcontrolsource.h?h=1.8
3939
*/
40-
public interface GstControlSourceAPI extends Library {
41-
42-
GstControlSourceAPI GSTCONTROLSOURCE_API = GstNative.load("gstcontroller", GstControlSourceAPI.class);
43-
44-
/**
45-
* GstTimedValue:
46-
* @timestamp: timestamp of the value change
47-
* @value: the corresponding value
48-
*
49-
* Structure for saving a timestamp and a value.
50-
*/
51-
public static final class TimedValue extends com.sun.jna.Structure {
52-
public static final String GTYPE_NAME = "GstTimedValue";
53-
54-
public volatile ClockTime timestamp;
55-
public volatile double value;
56-
57-
@Override
58-
protected List<String> getFieldOrder() {
59-
return Arrays.asList(new String[]{
60-
"timestamp", "value"
61-
});
62-
}
63-
}
64-
65-
public static interface GstControlSourceGetValue extends Callback {
66-
public boolean callback(ControlSource self, ClockTime timestamp, DoubleByReference value);
67-
}
68-
public static interface GstControlSourceGetValueArray extends Callback {
69-
public boolean callback(ControlSource self, ClockTime timestamp, ClockTime interval, int n_values, DoubleByReference values);
70-
}
71-
public static interface GstControlSourceBind extends Callback {
72-
public boolean callback(ControlSource self, GParamSpec pspec);
73-
}
74-
75-
/**
76-
* GstControlSource:
77-
* @get_value: Function for returning a value for a given timestamp
78-
* @get_value_array: Function for returning a values array for a given timestamp
79-
*
80-
* The instance structure of #GstControlSource.
81-
*/
82-
public static final class GstControlSourceStruct extends com.sun.jna.Structure {
83-
public volatile GstObject parent;
84-
85-
/*< public >*/
86-
public volatile GstControlSourceGetValue get_value; /* Returns the value for a property at a given timestamp */
87-
public volatile GstControlSourceGetValueArray get_value_array; /* Returns values for a property in a given timespan */
88-
89-
/*< private >*/
90-
public volatile Pointer[] _gst_reserved = new Pointer[GST_PADDING];
9140

92-
@Override
93-
protected List<String> getFieldOrder() {
94-
return Arrays.asList(new String[]{
95-
"parent", "get_value", "get_value_array",
96-
"_gst_reserved"
97-
});
98-
}
99-
}
41+
// @TODO review in line with https://gitlab.freedesktop.org/gstreamer/gstreamer/tree/master/libs/gst/controller
10042

101-
/**
102-
* GstControlSourceClass:
103-
* @parent_class: Parent class
104-
*
105-
* The class structure of #GstControlSource.
106-
*/
107-
public static final class GstControlSourceClass extends com.sun.jna.Structure {
108-
public volatile GstObjectClass parent_class;
109-
110-
/*< private >*/
111-
public volatile Pointer[] _gst_reserved = new Pointer[GST_PADDING];
112-
113-
@Override
114-
protected List<String> getFieldOrder() {
115-
return Arrays.asList(new String[]{
116-
"parent_class", "_gst_reserved"
117-
});
118-
}
119-
}
120-
121-
GType gst_control_source_get_type();
122-
123-
/* Functions */
124-
boolean gst_control_source_get_value(ControlSource self, ClockTime timestamp, GValue value);
125-
boolean gst_control_source_get_value_array(ControlSource self, ClockTime timestamp, ClockTime interval, int n_values, DoubleByReference values);
43+
public interface GstControlSourceAPI extends Library {
44+
//
45+
// GstControlSourceAPI GSTCONTROLSOURCE_API = GstNative.load("gstcontroller", GstControlSourceAPI.class);
46+
//
47+
// /**
48+
// * GstTimedValue:
49+
// * @timestamp: timestamp of the value change
50+
// * @value: the corresponding value
51+
// *
52+
// * Structure for saving a timestamp and a value.
53+
// */
54+
// public static final class TimedValue extends com.sun.jna.Structure {
55+
// public static final String GTYPE_NAME = "GstTimedValue";
56+
//
57+
// public volatile ClockTime timestamp;
58+
// public volatile double value;
59+
//
60+
// @Override
61+
// protected List<String> getFieldOrder() {
62+
// return Arrays.asList(new String[]{
63+
// "timestamp", "value"
64+
// });
65+
// }
66+
// }
67+
//
68+
// public static interface GstControlSourceGetValue extends Callback {
69+
// public boolean callback(ControlSource self, ClockTime timestamp, DoubleByReference value);
70+
// }
71+
// public static interface GstControlSourceGetValueArray extends Callback {
72+
// public boolean callback(ControlSource self, ClockTime timestamp, ClockTime interval, int n_values, DoubleByReference values);
73+
// }
74+
// public static interface GstControlSourceBind extends Callback {
75+
// public boolean callback(ControlSource self, GParamSpec pspec);
76+
// }
77+
//
78+
// /**
79+
// * GstControlSource:
80+
// * @get_value: Function for returning a value for a given timestamp
81+
// * @get_value_array: Function for returning a values array for a given timestamp
82+
// *
83+
// * The instance structure of #GstControlSource.
84+
// */
85+
// public static final class GstControlSourceStruct extends com.sun.jna.Structure {
86+
// public volatile GstObject parent;
87+
//
88+
// /*< public >*/
89+
// public volatile GstControlSourceGetValue get_value; /* Returns the value for a property at a given timestamp */
90+
// public volatile GstControlSourceGetValueArray get_value_array; /* Returns values for a property in a given timespan */
91+
//
92+
// /*< private >*/
93+
// public volatile Pointer[] _gst_reserved = new Pointer[GST_PADDING];
94+
//
95+
// @Override
96+
// protected List<String> getFieldOrder() {
97+
// return Arrays.asList(new String[]{
98+
// "parent", "get_value", "get_value_array",
99+
// "_gst_reserved"
100+
// });
101+
// }
102+
// }
103+
//
104+
// /**
105+
// * GstControlSourceClass:
106+
// * @parent_class: Parent class
107+
// *
108+
// * The class structure of #GstControlSource.
109+
// */
110+
// public static final class GstControlSourceClass extends com.sun.jna.Structure {
111+
// public volatile GstObjectClass parent_class;
112+
//
113+
// /*< private >*/
114+
// public volatile Pointer[] _gst_reserved = new Pointer[GST_PADDING];
115+
//
116+
// @Override
117+
// protected List<String> getFieldOrder() {
118+
// return Arrays.asList(new String[]{
119+
// "parent_class", "_gst_reserved"
120+
// });
121+
// }
122+
// }
123+
//
124+
// GType gst_control_source_get_type();
125+
//
126+
// /* Functions */
127+
// boolean gst_control_source_get_value(ControlSource self, ClockTime timestamp, GValue value);
128+
// boolean gst_control_source_get_value_array(ControlSource self, ClockTime timestamp, ClockTime interval, int n_values, DoubleByReference values);
126129
}

0 commit comments

Comments
 (0)