Changeset - b8d42a411e17
[Not reviewed]
default
0 2 0
drewp@bigasterisk.com - 9 years ago 2016-06-11 17:17:23
drewp@bigasterisk.com
turn off curvecalc->vidref
Ignore-this: 5388dc8917c25bbceac0a140330d1636
2 files changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
light9/vidref/main.py
Show inline comments
 
@@ -19,25 +19,25 @@ class Gui(object):
 
    def __init__(self, graph):
 
        wtree = gtk.Builder()
 
        wtree.add_from_file(sibpath(__file__, "vidref.glade"))
 
        mainwin = wtree.get_object("MainWindow")
 
        mainwin.connect("destroy", gtk.main_quit)
 
        wtree.connect_signals(self)
 
        gtk.rc_parse("theme/marble-ice/gtk-2.0/gtkrc")
 

	
 
        self.recordingTo = wtree.get_object('recordingTo')
 
        self.musicScale = wtree.get_object("musicScale")
 
        self.musicScale.connect("value-changed", self.onMusicScaleValue)
 
        # tiny race here if onMusicScaleValue tries to use musicTime right away
 
        self.musicTime = MusicTime(onChange=self.onMusicTimeChange)
 
        self.musicTime = MusicTime(onChange=self.onMusicTimeChange, pollCurvecalc=False)
 
        self.ignoreScaleChanges = False
 
        # self.attachLog(wtree.get_object("lastLog")) # disabled due to crashing
 

	
 
        # wtree.get_object("replayPanel").show() # demo only
 
        rp = wtree.get_object("replayVbox")
 
        self.replayViews = ReplayViews(rp)
 

	
 
        mainwin.show_all()
 
        vid3 = wtree.get_object("vid3")
 

	
 
        if 0:
 
            self.pipeline = Pipeline(
light9/web/timeline/timeline.coffee
Show inline comments
 
@@ -85,25 +85,25 @@ Polymer
 
    for evName in ['mousemove', 'touchmove']
 
      @addEventListener evName, (ev) =>
 
        ev.preventDefault()
 

	
 
        # todo: consolidate with _editorCoordinates version
 
        if ev.touches?.length
 
          ev = ev.touches[0]
 

	
 
        @root = @getBoundingClientRect()
 
        @viewState.mouse.pos($V([ev.pageX - @root.left, ev.pageY - @root.top]))
 

	
 
        @dia.setMouse(@viewState.mouse.pos())
 
        #@sendMouseToVidref()
 
        @sendMouseToVidref()
 

	
 
  sendMouseToVidref: ->
 
    now = Date.now()
 
    if (!@$.vidrefLastSent? || @$.vidrefLastSent < now - 200) && !@songPlaying
 
      @$.vidrefTime.body = {t: @latestMouseTime(), source: 'timeline'}
 
      @$.vidrefTime.generateRequest()
 
      @$.vidrefLastSent = now
 

	
 
  latestMouseTime: ->
 
    @zoomInX.invert(@viewState.mouse.pos().e(1))
 

	
 
  bindWheelZoom: ->
0 comments (0 inline, 0 general)