screencaster-gtk 0.0.3.alpha1 → 0.0.4.alpha1

data/lib/screencaster-gtk.rb

@@ -22,13 +22,19 @@ class ScreencasterGtk
   PIDFILE = File.join(SCREENCASTER_DIR, "run", "screencaster.pid")
 
   DEFAULT_SPACE = 10
+  RECORD_IMAGE = Gtk::Image.new(Gtk::Stock::MEDIA_RECORD, Gtk::IconSize::SMALL_TOOLBAR)
+  PAUSE_IMAGE = Gtk::Image.new(Gtk::Stock::MEDIA_PAUSE, Gtk::IconSize::SMALL_TOOLBAR)
+  STOP_IMAGE = Gtk::Image.new(Gtk::Stock::MEDIA_STOP, Gtk::IconSize::SMALL_TOOLBAR)
+  CANCEL_IMAGE = Gtk::Image.new(Gtk::Stock::CANCEL, Gtk::IconSize::SMALL_TOOLBAR)
+  QUIT_IMAGE = Gtk::Image.new(Gtk::Stock::QUIT, Gtk::IconSize::SMALL_TOOLBAR)
+
 
   def initialize
     #### Create Main Window
     
     LOGGER.info "Started"
-
-    @window = Gtk::Window.new
+    
+    @window = Gtk::Window.new("Screencaster")
     @window.signal_connect("delete_event") {
       LOGGER.debug "delete event occurred"
       #true
@@ -42,70 +48,71 @@ class ScreencasterGtk
     
     # The following gets minimize and restore events, but not iconify and de-iconify 
     @window.signal_connect("window_state_event") { |w, e|
-      puts ("window_state_event #{e.to_s}")
+      LOGGER.debug "window_state_event #{e.to_s}"
     }
     
     @window.border_width = DEFAULT_SPACE
+   
+    control_bar = Gtk::HBox.new(false, ScreencasterGtk::DEFAULT_SPACE)
     
-    bottom_columns = Gtk::HBox.new(false, ScreencasterGtk::DEFAULT_SPACE) # children have different sizes, spaced by DEFAULT_SPACE
-    
-    @select_button = Gtk::Button.new("Select Window to Record")
+    @select_button = Gtk::Button.new("Select Window")
     @select_button.signal_connect("clicked") {
       self.select
     }
-    bottom_columns.pack_start(@select_button, true, false)
+    control_bar.pack_start(@select_button, true, false)
     
-    button = Gtk::Button.new("Quit")
+    button = Gtk::Button.new
+    button.image = QUIT_IMAGE
     button.signal_connect("clicked") {
       self.quit
     }
-    bottom_columns.pack_end(button, true, false)
-    
-    bottom_row = Gtk::VBox.new(false, ScreencasterGtk::DEFAULT_SPACE) # children have different sizes, spaced by DEFAULT_SPACE
-    bottom_row.pack_end(bottom_columns, false)
+    control_bar.pack_end(button, true, false)
     
     control_columns = Gtk::HBox.new(false, ScreencasterGtk::DEFAULT_SPACE) # children have different sizes, spaced by DEFAULT_SPACE
     
-    @record_button = Gtk::Button.new("Record")
-    @record_button.sensitive = false
-    @record_button.signal_connect("clicked") {
-      self.record
-    }
-    control_columns.pack_start(@record_button, true, false)
-    
-    @pause_button = Gtk::Button.new("Pause")
-    @pause_button.sensitive = false
-    @pause_button.signal_connect("clicked") {
-      self.pause
+    @record_pause_button = Gtk::Button.new
+    @record_pause_button.image = RECORD_IMAGE
+    @record_pause_button.sensitive = false
+    @record_pause_button.signal_connect("clicked") {
+      self.record_pause
     }
-    control_columns.pack_start(@pause_button, true, false)
-    
-    @stop_button = Gtk::Button.new("Stop")
+    control_bar.pack_start(@record_pause_button, true, false)
+    
+    # @pause_button = Gtk::Button.new(Gtk::Stock::MEDIA_PAUSE)
+    # @pause_button.sensitive = false
+    # @pause_button.signal_connect("clicked") {
+      # self.pause
+    # }
+    # control_columns.pack_start(@pause_button, true, false)
+    # 
+    @stop_button = Gtk::Button.new
+    @stop_button.image = STOP_IMAGE
     @stop_button.sensitive = false
     @stop_button.signal_connect("clicked") {
       self.stop_recording
     }
-    control_columns.pack_start(@stop_button, true, false)
-    
-    control_row = Gtk::VBox.new(false, ScreencasterGtk::DEFAULT_SPACE) # children have different sizes, spaced by DEFAULT_SPACE
-    control_row.pack_start(control_columns, true, false)
+    control_bar.pack_start(@stop_button, true, false)
     
-    columns = Gtk::HBox.new(false, ScreencasterGtk::DEFAULT_SPACE)
-    @progress_bar = Gtk::ProgressBar.new
-    columns.pack_start(@progress_bar, true, false)
-    
-    @cancel_button = Gtk::Button.new("Cancel")
+    @cancel_button = Gtk::Button.new
+    @cancel_button.image = CANCEL_IMAGE
     @cancel_button.sensitive = false
     @cancel_button.signal_connect("clicked") {
       self.stop_encoding
     }
-    columns.pack_start(@cancel_button, true, false)
+    control_bar.pack_start(@cancel_button, true, false)
+    
+    control_row = Gtk::VBox.new(false, ScreencasterGtk::DEFAULT_SPACE) # children have different sizes, spaced by DEFAULT_SPACE
+    control_row.pack_start(control_bar, true, false)
+    
+    columns = Gtk::HBox.new(false, ScreencasterGtk::DEFAULT_SPACE)
+    @progress_bar = Gtk::ProgressBar.new
+    @progress_bar.text = "Select Window to Record"
+    columns.pack_start(@progress_bar, true, true)
     
     progress_row = Gtk::VBox.new(false, ScreencasterGtk::DEFAULT_SPACE) # children have different sizes, spaced by DEFAULT_SPACE
     progress_row.pack_start(columns, true, false)
     
     the_box = Gtk::VBox.new(false, ScreencasterGtk::DEFAULT_SPACE)
-    the_box.pack_end(bottom_row, false, false)
     the_box.pack_end(progress_row, false, false)
     the_box.pack_end(control_row, false, false)
     
@@ -208,13 +215,30 @@ class ScreencasterGtk
     LOGGER.debug "Selecting Window"
     @capture_window = Capture.new
     @capture_window.get_window_to_capture
-    @record_button.sensitive = true
+    @record_pause_button.sensitive = true
+  end
+  
+  def record_pause
+    LOGGER.debug "Record/Pause state: #{@capture_window.state}"
+    case @capture_window.state
+    when :recording
+      LOGGER.debug "Record/Pause -- pause"
+      pause
+    when :paused, :stopped
+      LOGGER.debug "Record/Pause -- record"
+      record
+    else
+      LOGGER.error "#{__FILE__} #{__LINE__}: Can't happen (state #{@capture_window.state})."
+    end
   end
   
   def record
     LOGGER.debug "Recording"
     recording
-    @capture_window.record
+    @capture_window.record { |percent, time_elapsed| 
+      @progress_bar.text = time_elapsed
+      LOGGER.debug "Did elapsed time: #{time_elapsed}"
+    }
   end
   
   def pause
@@ -248,14 +272,14 @@ class ScreencasterGtk
   
   def stop
     case @capture_window.state
-    when :recording || :paused
+    when :recording, :paused
       stop_recording
     when :encoding
       stop_encoding
     when :stopped
       # Do nothing
     else
-      LOGGER.error "#{__FILE__} #{__LINE__}: Can't happen."
+      LOGGER.error "#{__FILE__} #{__LINE__}: Can't happen (state #{@capture_window.state})."
     end
   end
   
@@ -272,42 +296,48 @@ class ScreencasterGtk
     when :stopped
       # Do nothing
     else
-      LOGGER.error "#{__FILE__} #{__LINE__}: Can't happen."
+      LOGGER.error "#{__FILE__} #{__LINE__}: Can't happen (state #{@capture_window.state})."
     end
   end
   
   def recording
-    self.status_icon.stock = Gtk::Stock::MEDIA_STOP
+    self.status_icon.stock = Gtk::Stock::MEDIA_PAUSE
+    @record_pause_button.image = PAUSE_IMAGE
     @select.sensitive = @select_button.sensitive = false
-    @pause.sensitive = @pause_button.sensitive = true
+    @record_pause_button.sensitive = true
+#    @pause.sensitive = @pause_button.sensitive = true
     @stop.sensitive = @stop_button.sensitive = true
-    @record.sensitive = @record_button.sensitive = false
+    @record.sensitive = false
     @cancel_button.sensitive = false
   end
   
   def not_recording
     self.status_icon.stock = Gtk::Stock::MEDIA_RECORD
+    @record_pause_button.image = RECORD_IMAGE
     @select.sensitive = @select_button.sensitive = true
-    @pause.sensitive = @pause_button.sensitive = false
+#    @pause.sensitive = @pause_button.sensitive = false
     @stop.sensitive = @stop_button.sensitive = false
-    @record.sensitive = @record_button.sensitive = ! @capture_window.nil?
+    @record.sensitive = @record_pause_button.sensitive = ! @capture_window.nil?
     @cancel_button.sensitive = false
   end
   
   def paused
     self.status_icon.stock = Gtk::Stock::MEDIA_RECORD
+    @record_pause_button.image = RECORD_IMAGE
+    @record_pause_button.sensitive = true
     @select.sensitive = @select_button.sensitive = false
-    @pause.sensitive = @pause_button.sensitive = false
+#    @pause.sensitive = @pause_button.sensitive = false
     @stop.sensitive = @stop_button.sensitive = true
-    @record.sensitive = @record_button.sensitive = ! @capture_window.nil?
+    @record.sensitive = ! @capture_window.nil?
     @cancel_button.sensitive = true
   end
   
   def encoding
     self.status_icon.stock = Gtk::Stock::MEDIA_STOP
-    @pause.sensitive = @pause_button.sensitive = false
+    @record_pause_button.image = RECORD_IMAGE
+#    @pause.sensitive = @pause_button.sensitive = false
     @stop.sensitive = @stop_button.sensitive = false
-    @record.sensitive = @record_button.sensitive = false
+    @record.sensitive = @record_pause_button.sensitive = false
     @cancel_button.sensitive = true
   end
   
@@ -403,7 +433,7 @@ class ScreencasterGtk
       Pause a running capture, or restart a paused capture
           EOF
           exit 0
-        when '--pause' || '--start'
+        when '--pause', '--start'
           if existing_pid then
             ScreencasterGtk::LOGGER.debug("Got a pause for PID #{existing_pid}")
             begin

data/lib/screencaster-gtk/capture.rb

@@ -108,10 +108,9 @@ class Capture
       @tmp_files = [] 
       self.total_amount = 0.0
     end
-    record_one_file(self.new_tmp_file)
-  end
-  
-  def record_one_file(output_file)
+
+    output_file = self.new_tmp_file
+
     @state = :recording
     capture_fps=24
     audio_options="-f alsa -ac 1 -ab 192k -i pulse -acodec pcm_s16le"
@@ -160,9 +159,12 @@ class Capture
         $logger.debug "****" + line
         if (line =~ /time=([0-9]*\.[0-9]*)/)
           duration = $1.to_f
+          $logger.debug "Recording about to yield #{self.total_amount + duration}"
+          yield 0.0, ProgressTracker::format_seconds(self.total_amount + duration)
         end
       end
       self.total_amount += duration
+      yield 0.0, ProgressTracker::format_seconds(self.total_amount)
     end
   end
   
@@ -211,27 +213,40 @@ class Capture
   
   def merge(output_file, input_files, feedback = proc {} )
     $logger.debug("Merging #{input_files.size.to_s} files: #{Capture.format_input_files_for_mkvmerge(input_files)}")
+    $logger.debug("Feedback #{feedback}")
     
+    # TODO: cp doesn't give feedback like mkvmerge does...
     if input_files.size == 1
-      cmd_line = "cp #{input_files[0]} #{output_file}"
+      cmd_line = "cp -v #{input_files[0]} #{output_file}"
       #cmd_line = "sleep 5"
     else
       cmd_line = "mkvmerge -v -o #{output_file} #{Capture.format_input_files_for_mkvmerge(input_files)}"
     end
     $logger.debug "Merge command line: #{cmd_line}"
     i, oe, t = Open3.popen2e(cmd_line)
+    $logger.debug "Thread from popen2e: #{t}"
     @pid = t.pid
     Process.detach(@pid)
     $logger.debug "@pid: #{@pid.to_s}"
     
     t = Thread.new do
+      $logger.debug "Thread from Thread.new: #{t}"
       # $logger.debug "Sleeping..."
       # sleep 2
       # $logger.debug "Awake!"
-      while oe.gets do
-        # $logger.debug "Line"
+      while l = oe.gets do
+        # TODO: Lots for duplicate code in this line to clean up.
+        if block_given? 
+          yield 0.5, ""
+        else
+          feedback.call 0.5, ""
+        end
+      end
+      if block_given?
+        yield 1.0, "Done"
+      else
+        feedback.call 1.0, "Done"
       end
-      feedback.call 1.0, "Done"
     end
     return t
   end

data/lib/screencaster-gtk/progresstracker.rb

@@ -34,12 +34,14 @@ module ProgressTracker
   end
   
   def time_remaining_s(format = "%dh %02dm %02ds remaining")
-    t = self.time_remaining
+    ProgressTracker.format_seconds(self.time_remaining, format)
+  end
+  
+  def self.format_seconds(t, format = "%dh %02dm %02ds")
     h = (t / 3600).to_i
     m = ((t - h * 3600) / 60).to_i
     s = (t % 60).to_i
     sprintf(format, h, m, s)
   end
-  
 end
 

data/lib/screencaster-gtk/savefile.rb

@@ -4,7 +4,7 @@ class SaveFile
   def self.set_up_dialog(file_name = "output.mp4")
     @dialog = Gtk::FileChooserDialog.new(
         "Save File As ...",
-        $window,
+        nil,
         Gtk::FileChooser::ACTION_SAVE,
         nil,
         [ Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL ],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: screencaster-gtk
 version: !ruby/object:Gem::Version
-  version: 0.0.3.alpha1
+  version: 0.0.4.alpha1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2