remove PATH spec, rename file to prevent any confusion ever [hopefully]

rdp · Sep 14, 2012 · a150c9f · a150c9f
1 parent 25c9605
commit a150c9f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/lib/simple_gui_creator.rb b/lib/simple_gui_creator.rb
@@ -11,10 +11,11 @@ def self.snake_case string
   end
 end
 
-require File.dirname(__FILE__) + '/simple_gui_creator/simple_gui_creator.rb'
+require File.dirname(__FILE__) + '/simple_gui_creator/simple_gui_creator_main.rb'
 
 # some autoloads, in case they save any load time...
-for clazz in [:DriveInfo, :MouseControl, :PlayAudio, :PlayMp3Audio, :RubyClip, :Storage]
+# not in the SGC namespace since they're somewhat separate from GUI control...which seems a bit weird...
+for clazz in [:FfmpegHelpers, :DriveInfo, :MouseControl, :PlayAudio, :PlayMp3Audio, :RubyClip, :Storage]
   new_path = File.dirname(__FILE__) + '/simple_gui_creator/' + SimpleGuiCreator.snake_case(clazz) + '.rb'
   autoload clazz, new_path
 end

diff --git a/lib/simple_gui_creator/ffmpeg_helpers.rb b/lib/simple_gui_creator/ffmpeg_helpers.rb
@@ -1,6 +1,4 @@
-# use vendored ffmpeg
 require 'sane'
-ENV['PATH'] = File.dirname(__FILE__) + '\vendor\ffmpeg\bin;' + ENV['PATH']
 
 module FfmpegHelpers
   def self.enumerate_directshow_devices

diff --git a/lib/simple_gui_creator/simple_gui_creator.rb → ...le_gui_creator/simple_gui_creator_main.rb b/lib/simple_gui_creator/simple_gui_creator.rb → ...le_gui_creator/simple_gui_creator_main.rb