sensible-cinema 0.24.4 → 0.24.5

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile CHANGED
@@ -103,7 +103,8 @@ task 'create_distro_dir' => :gemspec do # depends on gemspec...
103
103
  FileUtils.cp_r(existing, dir_out) # copies files, subdirs in
104
104
  # these belong in the parent dir, by themselves.
105
105
  FileUtils.cp(Dir["#{dir_out}/template_bats/*.bat"], "#{dir_out}/..")
106
- FileUtils.cp_r(dir_out + '/template_bats/mac', dir_out)
106
+ puts 'still not mac compatible OOTB'
107
+ # FileUtils.cp_r(dir_out + '/template_bats/mac', dir_out)
107
108
  p 'created (still need to zip it) ' + dir_out
108
109
  FileUtils.rm_rf Dir[dir_out + '/**/{spec}'] # don't need to distribute those..save 3M!
109
110
  end
data/TODO CHANGED
@@ -54,6 +54,7 @@
54
54
  make it load faster! this is cuh-razy! or splash screen! yes!
55
55
 
56
56
  == yes do, un-ordered currently, from the various future release options ==
57
+ new icon plz
57
58
  facebook survey :)
58
59
  "--developer" mode
59
60
  export JSON command line, note it in the docu, show it in --developer mode, no new bat file for developer mode
@@ -61,12 +62,14 @@
61
62
  fan editor (after C player ?? though I suppose we could bring back batch mplayer to also do this...)
62
63
  "fan editor" .bat file LOL
63
64
 
65
+ upconvert 4200 known to fail...
66
+
64
67
  new button "auto-test" a subtitles file for timing :)
65
68
  new upconv button: take some snapshots (just to straight mjpeg or jpeg or the what not)
66
69
  auto-update website on release.
67
70
  publish a ripped raw big bunny
68
71
  update development howto
69
- @jruby scan court jester is *so* slow...what the...
72
+ @jruby scan court jester is *so* slow...what the...[mac at least...]
70
73
  urug again?
71
74
  after works in mac. Why not?
72
75
  netflix upconverter
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.24.4
1
+ 0.24.5
@@ -183,14 +183,14 @@ module SensibleSwing
183
183
  LocalStorage[UpConvertEnglish] = nil
184
184
  display_current_upconvert_setting
185
185
  }
186
- medium_dvd = new_jbutton("set upconvert options to DVD-style input") {
186
+ medium_dvd = new_jbutton("Change upconvert options to DVD-style input") {
187
187
  LocalStorage[UpConvertKey] = "pullup,softskip,hqdn3d=0:1:4:4,scale=SCREEN_X:-10:0:0:2"
188
188
  # hqdn3d[=luma_spatial:chroma_spatial:luma_tmp:chroma_tmp]
189
189
  LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=75.0 -ssf cs=7.0"
190
190
  LocalStorage[UpConvertEnglish] = "DVD"
191
191
  display_current_upconvert_setting
192
192
  }
193
- high_compression = new_jbutton("set upconvert options for playing back highly compressed video") {
193
+ high_compression = new_jbutton("Change upconvert options for playing back highly compressed video") {
194
194
  # -autoq 6 -vf pp [?]
195
195
  LocalStorage[UpConvertEnglish] = "high compressed"
196
196
  LocalStorage[UpConvertKey] = "pullup,softskip,hqdn3d=0:1:4:4,pp=hb:y/vb:y,scale=SCREEN_X:-10:0:0:3" # ordering?
@@ -198,7 +198,7 @@ module SensibleSwing
198
198
  display_current_upconvert_setting
199
199
  # -Processing method: mplayer with accurate deblocking ???
200
200
  }
201
- new_jbutton("set upconvert options to experimental style playback") {
201
+ new_jbutton("Change upconvert options to experimental style playback") {
202
202
  LocalStorage[UpConvertKey] = "pullup,softskip,hqdn3d=7:7:5,scale=SCREEN_X:-10:0:0:10"
203
203
  LocalStorage[UpConvertKeyExtra] = "-sws 9 -ssf ls=100.0 -ssf cs=75.0"
204
204
  LocalStorage[UpConvertEnglish] = "experimental"
@@ -263,13 +263,18 @@ module SensibleSwing
263
263
 
264
264
  def display_current_upconvert_setting
265
265
  change_upconvert_line_to_current
266
- show_blocking_message_dialog get_current_upconvert_as_phrase
266
+ @display_current_upconvert_setting_dialog
267
+ @display_current_upconvert_setting_dialog = show_non_blocking_message_dialog get_current_upconvert_as_phrase
267
268
  p get_current_upconvert_as_phrase
268
269
  end
269
270
 
270
271
  def get_current_upconvert_as_phrase
271
272
  settings = LocalStorage[UpConvertEnglish]
272
- "Upconvert options currently #{ settings ? "are set to #{settings} style" : "are NOT SET"} (screen multiplier #{LocalStorage['screen_multiples']})."
273
+ out = "Upconvert options currently #{ settings ? "are set to #{settings} style" : "are NOT SET"}"
274
+ if settings
275
+ out += " (screen multiplier #{LocalStorage['screen_multiples']})."
276
+ end
277
+ out
273
278
  end
274
279
 
275
280
  def get_current_max_width_resolution
@@ -488,20 +493,24 @@ module SensibleSwing
488
493
  choose_file_and_edl_and_create_sxs_or_play false
489
494
  end
490
495
 
491
- @open_help_file = new_jbutton("View Sensible Cinema Documentation") do
492
- show_in_explorer __DIR__ + "/../documentation"
493
- end
494
-
495
496
  if LocalStorage[UpConvertEnglish]
497
+ add_open_documentation_button
496
498
  @upconv_line = add_text_line " #{get_current_upconvert_as_phrase}"
497
499
  else
498
500
  @upconv_line = add_text_line ''
501
+ add_open_documentation_button
499
502
  end
500
503
 
501
504
  add_change_upconvert_options_button
502
505
 
503
506
  end
504
507
 
508
+ def add_open_documentation_button
509
+ @open_help_file = new_jbutton("View Sensible Cinema Documentation") do
510
+ show_in_explorer __DIR__ + "/../documentation" # TODO mac :)
511
+ end
512
+ end
513
+
505
514
  def choose_file_and_edl_and_create_sxs_or_play just_create_dot_edl_file_instead_of_play
506
515
  filename_mpg = new_existing_file_selector_and_select_file( "pick moviefile (like moviename.mpg)")
507
516
  edl_filename = new_existing_file_selector_and_select_file( "Pick an EDL file to use with it", EDL_DIR)
@@ -598,7 +607,7 @@ module SensibleSwing
598
607
  extra_options += " -mouse-movements #{get_upconvert_secondary_settings} " # just in case smplayer also needs -mouse-movements... :)
599
608
  extra_options += " -lavdopts threads=#{OS.cpu_count} " # just in case this helps [supposed to with H.264] :)
600
609
  if OS.mac? || force_use_mplayer
601
- @_run_smplayer_instructions ||= show_mplayer_instructions
610
+ show_mplayer_instructions_once
602
611
  conf_file = File.expand_path './mplayer_input_conf'
603
612
  File.write conf_file, "MOUSE_BTN0_DBL vo_fullscreen\nMOUSE_BTN2 vo_fullscreen\nKP_ENTER dvdnav select\n" # dvdnav doesn't work here...
604
613
  if OS.windows?
@@ -727,15 +736,19 @@ module SensibleSwing
727
736
  end
728
737
 
729
738
  def play_dvd_smplayer_unedited use_mplayer_instead = false, show_instructions = true
730
- drive, dvd_volume_name, dvd_id, edl_path_maybe_nil, descriptors_maybe_nil = choose_dvd_or_file_and_edl_for_it false
739
+ drive_or_file, dvd_volume_name, dvd_id, edl_path_maybe_nil, descriptors_maybe_nil = choose_dvd_or_file_and_edl_for_it false
731
740
  if descriptors_maybe_nil
732
741
  title_track_maybe_nil = get_title_track(descriptors_maybe_nil, false)
733
742
  end
734
- file_to_play = "dvdnav://#{title_track_maybe_nil}"
735
- options = " -osd-fractions 2 -nocache -dvd-device #{drive} "
743
+ if dvd_id == NonDvd # TODO smelly...this if statement all over the place...
744
+ file_to_play = drive_or_file
745
+ else
746
+ file_to_play = "dvdnav://#{title_track_maybe_nil}"
747
+ end
748
+ options = " -osd-fractions 2 -nocache -dvd-device #{drive_or_file} "
736
749
  if show_instructions
737
750
  # want this even with smplayer sometimes I guess...
738
- @play_smplayer_warn ||= show_mplayer_instructions
751
+ show_mplayer_instructions_once
739
752
  end
740
753
 
741
754
  run_smplayer_non_blocking file_to_play, options, use_mplayer_instead
@@ -744,18 +757,17 @@ module SensibleSwing
744
757
 
745
758
  EdlTempFile = Dir.tmpdir + '/mplayer.temp.edl'
746
759
 
747
- def show_mplayer_instructions
748
- show_non_blocking_message_dialog <<-EOL
749
- About to run mplayer.
750
- To control it, use
760
+ def show_mplayer_instructions_once
761
+ @_show_mplayer_instructions_once ||= show_non_blocking_message_dialog <<-EOL
762
+ About to run mplayer. To control it, use
751
763
  spacebar : pause,
752
764
  double clicky/right click : toggle full screen,
753
- arrow keys (left, right, up down) to seek/scan
765
+ arrow keys (left, right, up down, pg up, pg dn) to seek/scan
754
766
  / and * : inc/dec volume.
755
767
  'o' key: turn on on-screen-display timestamps (note: the OSD timestamps [upper left] are 30 fps so will need to be converted to use).
756
768
  'v' key: turn off subtitles.
757
769
  '.' key: step one frame.
758
- # key: switch audio language track
770
+ # key: change audio language track
759
771
  EOL
760
772
  end
761
773
 
@@ -845,7 +857,7 @@ module SensibleSwing
845
857
 
846
858
  returned = JOptionPane.showConfirmDialog self, message, title, JOptionPane::YES_NO_CANCEL_OPTION
847
859
  assert_confirmed_dialog returned, license_url_should_also_be_embedded_by_you_in_message
848
- p 'confirmation of sensible cinema related license noted of: ' + license_name
860
+ p 'confirmation of sensible cinema related license saved of: ' + license_name
849
861
  throw unless returned == 0
850
862
  old.each{|name, old_setting| UIManager.put(name, old_setting)}
851
863
  end
@@ -1,3 +1,8 @@
1
+ == 0.24.5 ==
2
+
3
+ Fix some options for advanced mode so that it can playback files better.
4
+ Tweak upconvert to make it a bit more user friendly.
5
+
1
6
  == 0.24.4 ==
2
7
 
3
8
  Note that previous releases had the ability to "invert" skipping scenes,
@@ -1,4 +1,4 @@
1
1
  #!/usr/bin/env bash
2
2
  cd ../sensible-cinema
3
- java -cp "./vendor/jruby-complete-1.6.2.jar" org.jruby.Main bin/sensible-cinema $1 $2 $3 || (echo ERROR. Please look for error message, above, and report back the error you see, or fix it && read -p "Press any key to continue...")
3
+ java -Xdock:name="Sensible Cinema" -Xdock:icon="./vendor/monkey.png" -cp "./vendor/jruby-complete-1.6.2.jar" org.jruby.Main bin/sensible-cinema $1 $2 $3 || (echo ERROR. Please look for error message, above, and report back the error you see, or fix it && read -p "Press any key to continue...")
4
4
 
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: sensible-cinema
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.24.4
5
+ version: 0.24.5
6
6
  platform: ruby
7
7
  authors:
8
8
  - Roger Pack
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-07-18 00:00:00 -06:00
13
+ date: 2011-07-19 00:00:00 -06:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency