ipcam 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3673112cdc6871dd10631f4a67f4f5e1c93b3f6056af3acd6fbee4ef1ca3a8f8
-  data.tar.gz: 119f2126a4a68f850285af9f8fe06e32e08324ff4e17b1939ba0e7ad2f818122
+  metadata.gz: 6417acb08bb6a9f12d87c6415ac262af7b33abe45a13c861ba3f8285792d8346
+  data.tar.gz: e6c3d45e5e8ab073e8ed61518140636b69354f2767f31907f1913370e16d62c8
 SHA512:
-  metadata.gz: 63874cacbf9f2b194b4829a168067b976b3f6692cdf2b1fdc807b1fe66ca1863af4f43857a6b0a89a606af4d050ddb2372a79c21da859a990ba1407951651096
-  data.tar.gz: 871dbee9300615fea6fd5b98e0053f0afe1e5311a1cfe615548a6ed189b45ac4b66d0e8f31d1a1d5dd15c595d8ff5489a1182e36ee7d6b4a4a5353cb1f8390aa
+  metadata.gz: e413a40ad853c87b4d51c9b572de699188a684c35d23bf3eee5eb64e938a284e5b065dde725bab3603984570e2fe51d0ba5787e35580482d7d6db5238cb30206
+  data.tar.gz: 7d9a455266293089e9fd757ee526c95587b6e33f1cdea00fb63f042064c921cbe5fb8698a84da348a14c32b543681bb01db0b10968dd1c0b21f5d5dfb76ab133

data/ipcam.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency "v4l2-ruby", "~> 0.9.2"
+  spec.add_dependency "v4l2-ruby", "~> 0.10.0"
   spec.add_dependency "puma", "~> 3.12.1"
   spec.add_dependency "sinatra", "~> 2.0.5"
   spec.add_dependency "sinatra-contrib", "~> 2.0.5"

data/lib/ipcam/main.rb

@@ -224,10 +224,10 @@ module IPCam
     end
     private :broadcast
 
-    def change_state(state)
+    def change_state(state, force = false)
       flag = @mutex.try_lock
 
-      if @state != state
+      if @state != state or force
         @state = state
         broadcast(:change_state, state)
       end
@@ -267,17 +267,13 @@ module IPCam
         @camera.stop
         retry
 
-      rescue => e
-        change_state(:ABORT)
-        raise(e)
-
       ensure
         @camera.stop if (@camera.busy? rescue false)
       end
 
     rescue => e
       $logger.error("main") {"camera error occured (#{e.message})"}
-      change_state(:ABORT)
+      change_state(:ABORT, :force)
 
     ensure
       @camera&.close

data/lib/ipcam/version.rb

@@ -1,3 +1,3 @@
 module IPCam
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/resource/ipcam/js/main.js

@@ -444,6 +444,8 @@
       $('select#image-size > option').remove();
       $('select#framerate > option').remove();
       $('div#controls').empty();
+
+      clearPreviewCanvas();
     }
 
     $('button#action').prop('disabled', false);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipcam
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Hirosho Kuwagata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement