summaryrefslogtreecommitdiff
path: root/src/VideoSupport.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-10-01 21:55:21 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-10-01 21:55:21 +0200
commit0ac74d65f16aa7eb70669b07c25cb90114eb9435 (patch)
tree31cd86e358bc70e6d83955fdcc0d8e05fc32c325 /src/VideoSupport.vala
parent0b99aa7b114b6c8eb0d55742c4be2f3a73f44e39 (diff)
parentf542481df58f3222143bc260feb34b5cf537d8e0 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/VideoSupport.vala')
-rw-r--r--src/VideoSupport.vala40
1 files changed, 3 insertions, 37 deletions
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index 533dfe6..ec827ea 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -359,8 +359,6 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
}
}
- private static bool interpreter_state_changed;
- private static int current_state;
private static bool normal_regen_complete;
private static bool offline_regen_complete;
public static VideoSourceCollection global;
@@ -381,8 +379,6 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
// Must initialize static variables here.
// TODO: set values at declaration time once the following Vala bug is fixed:
// https://bugzilla.gnome.org/show_bug.cgi?id=655594
- interpreter_state_changed = false;
- current_state = -1;
normal_regen_complete = false;
offline_regen_complete = false;
@@ -392,19 +388,9 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
Gst.init(ref args);
var registry = Gst.Registry.@get ();
- int saved_state = Config.Facade.get_instance().get_video_interpreter_state_cookie();
- current_state = (int) registry.get_feature_list_cookie();
- if (saved_state == Config.Facade.NO_VIDEO_INTERPRETER_STATE) {
- message("interpreter state cookie not found; assuming all video thumbnails are out of date");
- interpreter_state_changed = true;
- } else if (saved_state != current_state) {
- message("interpreter state has changed; video thumbnails may be out of date");
- interpreter_state_changed = true;
- }
- /* First do the cookie state handling, then update our local registry
- * to not include vaapi stuff. This is basically to work-around
- * concurrent access to VAAPI/X11 which it doesn't like, cf
+ /* Update our local registr to not include vaapi stuff. This is basically to
+ * work-around concurrent access to VAAPI/X11 which it doesn't like, cf
* https://bugzilla.gnome.org/show_bug.cgi?id=762416
*/
@@ -427,9 +413,6 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
for (int ctr = 0; ctr < count; ctr++) {
Video video = new Video(all.get(ctr));
- if (interpreter_state_changed)
- video.set_is_interpretable(false);
-
if (video.is_trashed())
trashed_videos.add(video);
else if (video.is_offline())
@@ -446,10 +429,6 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
global.add_many(all_videos);
}
- public static bool has_interpreter_state_changed() {
- return interpreter_state_changed;
- }
-
public static void notify_normal_thumbs_regenerated() {
if (normal_regen_complete)
return;
@@ -457,8 +436,6 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
message("normal video thumbnail regeneration completed");
normal_regen_complete = true;
- if (normal_regen_complete && offline_regen_complete)
- save_interpreter_state();
}
public static void notify_offline_thumbs_regenerated() {
@@ -468,17 +445,6 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
message("offline video thumbnail regeneration completed");
offline_regen_complete = true;
- if (normal_regen_complete && offline_regen_complete)
- save_interpreter_state();
- }
-
- private static void save_interpreter_state() {
- if (interpreter_state_changed) {
- message("saving video interpreter state to configuration system");
-
- Config.Facade.get_instance().set_video_interpreter_state_cookie(current_state);
- interpreter_state_changed = false;
- }
}
public static void terminate() {
@@ -749,7 +715,7 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
public override void mark_online() {
remove_flags(FLAG_OFFLINE);
- if ((!get_is_interpretable()) && has_interpreter_state_changed())
+ if ((!get_is_interpretable()))
check_is_interpretable().foreground_finish();
}