Changeset 15

Timestamp:

05/04/07 12:41:46 (2 years ago)

Author:

satelliittipupu

Message:

Importing added. Drag and drop started.

Files:

• trunk/pihlaja/src/dsss.conf (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/canvas/canvas.d (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/core/discoverer.d (modified) (54 diffs)
• trunk/pihlaja/src/pihlaja/core/edit.d (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/core/material.d (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/core/movie.d (modified) (14 diffs)
• trunk/pihlaja/src/pihlaja/core/project.d (modified) (10 diffs)
• trunk/pihlaja/src/pihlaja/core/scene.d (modified) (11 diffs)
• trunk/pihlaja/src/pihlaja/core/scenechain.d (modified) (7 diffs)
• trunk/pihlaja/src/pihlaja/ui/materialstreeview.d (modified) (17 diffs)
• trunk/pihlaja/src/pihlaja/ui/projectwindow.d (modified) (7 diffs)

trunk/pihlaja/src/dsss.conf

@@ -16 +16 @@
-#debug symbols:
-
-
+#
-buildflags += -debug=gstreamer
-buildflags += -debug=gstreamerbus
@@ -27 +27 @@
-buildflags += -debug=LinkableScene
-buildflags += -debug=SceneChain
-
+#
-#buildflags += -debug=MaterialsTreeview
-#buildflags += -debug=Render
-#buildflags += -debug=Invalidation
-#buildflags += -debug=AdjustTree
-
+#
-#buildflags += -debug=RTreeError
-#buildflags += -debug=RTreeDebugCheck
-#buildflags += -debug=RTreeTraverse
-
+#
-#buildflags += -debug=FindLeaf
-#buildflags += -debug=List
-#buildflags += -debug=ClosestCutFit
-#buildflags += -debug=CheckOverlapping
-#
+
-#buildflags += -debug=EditGroup
-#buildflags += -debug=IterateWithNearestNeighbour

trunk/pihlaja/src/pihlaja/canvas/canvas.d

@@ -200 +200 @@
-        }
-    }
+    
+    /*
+    * This is used to draw stuff that the
+    * Movie wants to draw. So overload this
+    * to draw some stuff in Movie.
+    */
+    void render( Cairo cr )
+    {
+    
+    }
-
-    int onExpose(GdkEventExpose* event, Widget widget)
@@ -367 +377 @@
-                lastHitLinkableScene.renderLinkingRight( cr, crx(mouseCX), cry(mouseCY) );
-        }
-
+
+
+
+
+
-        cr.restore();
-

trunk/pihlaja/src/pihlaja/core/discoverer.d

@@ -137 +137 @@
-    void addFile( char[] filename )
-    {
-, filename )
-, filename )
+)(filename).newline
+)(filename).newline
-        //queue a filename to be discovered
-        //gst.info("filename: %s" % filename)
@@ -156 +156 @@
-        {
-            //gst.warning
-
+.newline
-            return false;
-        }
@@ -163 +163 @@
-        {
-            //gst.warning
-
+.newline
-            return false;
-        }
@@ -169 +169 @@
-        working = true;
-        
-
+.newline
-        //gobject.idle_add( &analyze );
-        m_idle = new Idle( &analyze );
+        
-        /*if( m_mainloop !is null )
-        {
@@ -187 +188 @@
-    protected bool finishAnalysis()
-    {
-, current )
+)( current ).newline
-        debug(Discoverer) scope(exit) Stdout("Discoverer.finishAnalysis() END.").newline;
-        //Call this method when the current file is analyzed
@@ -194 +195 @@
-        if( analyzing == false )
-        {
-
+.newline
-            return false;
-        }
-
-/*
-
-
+
+
+.newline
-            finishTimeout.stop();
-            //finishTimeout = null;
-
-*/
+//
+
-        
-        //Source.remove( timeoutid );
@@ -215 +216 @@
-        thisdone = true;
-
-, current )
+)( current ).newline
-
-        //finish current, cleanup
@@ -234 +235 @@
-            dbin.disconnectOnPadAdded();
-        
-
+.newline
-        
-        //res =
@@ -241 +242 @@
-            if( pipeline.setState( GstState.NULL ) == GstStateChangeReturn.FAILURE )
-            {
-
+.newline
-            }
-        }
-        //gst.info("after setting to NULL : %s" % res)
-        
-
+.newline
-        if( fakesink !is null )
-            fakesink.setState( GstState.NULL );
@@ -252 +253 @@
-        if( currentVideoMaterial !is null )
-        {
-
+.newline
-            ///////BACK currentVideoMaterial.addMediaTags( currentTags );
-            
-            //emit('finished-analyzing', currentVideoMaterial);
-        }
+        else Stdout("\nNo video material found in ")( current ).newline;
-        
-        if( currentAudioMaterial !is null )
-        {
-
+.newline
-            ///////BACK currentAudioMaterial.addMediaTags( currentTags );
-            
-            //emit('finished-analyzing', currentAudioMaterial);
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        //Set all to their initial state:
-        //currentTags = [];
@@ -291 +303 @@
-            working = false;
-            //gst.info
-
+.newline
-            //emit("ready")
-        }
@@ -302 +314 @@
-    protected bool timeoutCb()
-    {
-, current )
+)( current ).newline
-        debug(Discoverer) scope(exit) Stdout("Discoverer.timeoutCb() END.").newline;
-        Stdout("timeoutCb.");
-        //gobject.idle_add(_finishAnalysis);
-        
-        if( analyzing == false )
-        {
+            Stdout("timeoutCb() analyzing is false. returning false.").newline;
-            return false;
-        }
+        Stdout("timeoutCb() analyzing is true. adding idle listener for finishAnalysis.").newline;
-        
-        //m_mainloop.idleAdd( &finishAnalysis );
@@ -323 +336 @@
-        debug(Discoverer) scope(exit) Stdout("Discoverer.analyze() END.").newline;
-        
-")
+.").newline
-        
-        analyzing = true;
@@ -331 +344 @@
-        current = queue.head();
-        queue.removeHead();//Why can't there be a popStart() kind of method for LinkSeq?
-, current)
+)( current).newline
-        currentVideoMaterial = null;
-        currentAudioMaterial = null;
-        
-        //setup graph and start analyzing
-
+.newline
-        pipeline = new Pipeline( "Discoverer-" ~ current );
-        
-
+.newline
-        //source = gst.element_make_from_uri(gst.URI_SRC, current, "src-%s" % current);
-        source = ElementFactory.make( "filesrc", "src-" ~ current );
@@ -346 +359 @@
-        {
-            //gst.warning
-, current )
+)( current ).newline
-            //emit("not_media_file", current, "Couldn't construct pipeline.")
-            //gobject.idle_add(_finishAnalysis)
@@ -355 +368 @@
-        }
-        
-, current )
+)( current ).newline
-        source.location( current );
-
-
+.newline
-        //if os.getenv("USE_DECODEBIN2"):
-
+2
-        //else:
-        //  dbin = gst.element_factory_make("decodebin", "dbin")
-
-
+.newline
-        //signalsid.append((dbin, dbin.connect("new-decoded-pad", _newDecodedPadCb)))
-        //signalsid.append((dbin, dbin.connect("unknown-type", _unknownTypeCb)))
@@ -378 +391 @@
-        pipeline.add( dbin );
-        source.link(dbin);
-
+.newline
-
-        //adding fakesink to make pipeline not terminate state before receiving no-more-pads
@@ -384 +397 @@
-        pipeline.add(fakesink);
-
-
+.newline
-        //bus = pipeline.get_bus()
-        //signalsid.append((bus, bus.connect("message", _busMessageCb)))
@@ -390 +403 @@
-        busWatchId = pipeline.getBus().addWatch( &busMessageCb );
-
-
+.newline
-
-        if( pipeline.setState(GstState.PAUSED) == GstStateChangeReturn.FAILURE )
-        {
-            //emit("not_media_file", current, "Pipeline didn't want to go to PAUSED");
-
+.newline
-            //gobject.idle_add(_finishAnalysis)
-            //m_mainloop.idleAdd( &finishAnalysis );
@@ -452 +465 @@
-    bool busMessageCb( Message message )
-    {
-//debug(Discoverer) Stdout("Discoverer.busMessageCb() START. ", current )
-//debug(Discoverer) scope(exit) Stdout("Discoverer.busMessageCb() END. ")
+debug(gstreamerbus) debug(Discoverer) Stdout("Discoverer.busMessageCb() START. ")( current ).newline
+debug(gstreamerbus) debug(Discoverer) scope(exit) Stdout("Discoverer.busMessageCb() END. ").newline
-        
-        if( thisdone || message is null || pipeline is null )
-        {
-
+.newline
-            return true;
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            //Pipeline blom = cast(Pipeline) message.src();
-        
@@ -476 +540 @@
-                if( prev == GstState.READY && anew == GstState.PAUSED && pending == GstState.VOID_PENDING )
-                {
-
+.newline
-                    prerolled = true;
-                    // Let's get the information from all the pads
@@ -483 +547 @@
-                    if( currentVideoMaterial !is null && currentVideoMaterial.materialType() == MaterialType.VIDEO )//currentVideoMaterial.is_video )
-                    {
-
+.newline
-                        //gst.log("pipeline has gone to PAUSED, now pushing to PLAYING")
-                        if( pipeline.setState(GstState.PLAYING) == GstStateChangeReturn.FAILURE )
-                        {
-                            //emit("not_media_file", current, "Pipeline didn't want to go to PLAYING")
-
+.newline
-                            //gobject.idle_add(_finishAnalysis)
-                            //m_mainloop.idleAdd( &finishAnalysis );
@@ -497 +561 @@
-                    else if( nomorepads )
-                    {
-
+.newline
-                        //gobject.idle_add(_finishAnalysis)
-                        //m_mainloop.idleAdd( &finishAnalysis );
@@ -505 +569 @@
-                    else
-                    {
-
+.newline
-                    }
-                }
-            //}
-            //else Stdout("message.src != pipeline. blaah...");
+                
+            break;
+
+            case GstMessageType.STATE_DIRTY:
+                debug(gstreamerbus) Stdout("Bus message: State dirty.").newline;
+            break;
+
+            case GstMessageType.STEP_DONE:
+                debug(gstreamerbus) Stdout("Bus message: Step done.").newline;
+            break;
+
+            case GstMessageType.CLOCK_PROVIDE:
+                debug(gstreamerbus) Stdout("Bus message: CLOCK_PROVIDE.").newline;
+            break;
+
+            case GstMessageType.CLOCK_LOST:
+                debug(gstreamerbus) Stdout("Bus message: CLOCK_LOST.").newline;
+            break;
+
+            case GstMessageType.NEW_CLOCK:
+                debug(gstreamerbus) Stdout("Bus message: NEW_CLOCK.").newline;
+            break;
+
+            case GstMessageType.STRUCTURE_CHANGE:
+                debug(gstreamerbus) Stdout("Bus message: STRUCTURE_CHANGE.").newline;
+            break;
+
+            case GstMessageType.STREAM_STATUS:
+                debug(gstreamerbus) Stdout("Bus message: STREAM_STATUS.").newline;
+            break;
+
+            case GstMessageType.APPLICATION:
+                debug(gstreamerbus) Stdout("Bus message: APPLICATION.").newline;
+            break;
+
+            case GstMessageType.ELEMENT:
+                debug(gstreamerbus) Stdout("Bus message: ELEMENT.").newline;
+                //gst.debug("Element message %s" % message.structure.to_string())
+                if( message.structure.getName() == "redirect" )
+                {
+                    debug(Discoverer) Stdout("We don't implement redirections currently, ignoring file").newline;//gst.warning
+                    //finishAnalysis();//gobject.idle_add(_finishAnalysis)
+                    //m_mainloop.idleAdd( &finishAnalysis );
+                    m_idle.addListener( &finishAnalysis );
+                }
+            break;
+
+            case GstMessageType.SEGMENT_START:
+                debug(gstreamerbus) Stdout("Bus message: SEGMENT_START.").newline;
+            break;
+
+            case GstMessageType.SEGMENT_DONE:
+                debug(gstreamerbus) Stdout("Bus message: SEGMENT_DONE.").newline;
+            break;
+
+            case GstMessageType.DURATION:
+                debug(gstreamerbus) Stdout("Bus message: DURATION.").newline;
+            break;
+
+            default:
+            break;
+        }
+        /*
+        //gst.log("%s:%s" % (message.src.get_name(), message.type))
+        if( message.type == GstMessageType.STATE_CHANGED )
+        {   
-        }
-        else if( message.type == GstMessageType.EOS )
-        {
-            debug(Discoverer) Stdout("got EOS");//gst.log
-            thisdone = true;
-            //filename = "/tmp/" + currentVideoMaterial.name.encode('base64').replace('\n','') + ".png";
-            //if os.path.isfile(filename):
-                //currentVideoMaterial.setThumbnail(filename)
-            //gobject.idle_add(_finishAnalysis)
-            //m_mainloop.idleAdd( &finishAnalysis );
-            m_idle.addListener( &finishAnalysis );
-            //finishAnalysis();
-        }
-        else if( message.type == GstMessageType.ERROR )
-        {
-debug(Discoverer) Stdout("Discoverer.busMessageCb() Got error message.")
+//debug(Discoverer) Stdout("Discoverer.busMessageCb() Got error message.").newline
-            //error, detail = message.parse_error()
-            //handleError(error, detail, message.src)
@@ -531 +652 @@
-        else if( message.type == GstMessageType.WARNING )
-        {
-debug(Discoverer) Stdout("got a WARNING")
+//debug(Discoverer) Stdout("got a WARNING").newline
-        }
-        else if( message.type == GstMessageType.ELEMENT )
-        {
-            //gst.debug("Element message %s" % message.structure.to_string())
-            if( message.structure.getName() == "redirect" )
-            {
-                debug(Discoverer) Stdout("We don't implement redirections currently, ignoring file");//gst.warning
-                //finishAnalysis();//gobject.idle_add(_finishAnalysis)
-                //m_mainloop.idleAdd( &finishAnalysis );
-                m_idle.addListener( &finishAnalysis );
-            }
-        }
-        else if( message.type == GstMessageType.TAG )
-        {
-            debug(Discoverer) Stdout("Discoverer.busMessageCb() Got tag message for file ", current );
-            //gst.debug("Got tags %s" % message.structure.to_string())
-            //currentTags.append(message.parse_tag());
-            currentTags = message.parseTag();
-        }
-        else
@@ -555 +664 @@
-            //gst.log("%s:%s" % ( message.type, message.src))
-            
-
+*/
-        return true;
-    }
@@ -561 +670 @@
-    protected void getPadsInfo()
-    {
-, current )
-, current )
+)( current ).newline
+)( current ).newline
-        
-        // iterate all src pads and check their information
-, current )
-
-
+)( current ).newline
+
+.newline
-        
-        if( dbin is null )
-        {
-
+.newline
-            return;
-        }
@@ -579 +688 @@
-        foreach(Pad pad; dbin.pads() )  //for pad in list(pipeline.get_by_name("dbin").pads()):
-        {
-, pad.getName() )
+)( pad.getName() ).newline
-        
-            if( pad.getDirection() == GstPadDirection.SINK )
-            {
-
+.newline
-                continue;
-            }
@@ -592 +701 @@
-            if( caps is null )
-            {
-
+.newline
-                trytogetnegcaps = true;
-            }
-            else if( caps.getCapsStruct() is null )
-            {
-
+.newline
-                trytogetnegcaps = true;
-            }
@@ -603 +712 @@
-            if( caps.isFixed() == false || trytogetnegcaps == true )
-            {
-
+.newline
-                caps = pad.getNegotiatedCaps();
-            }
@@ -609 +718 @@
-            if( caps is null )// || caps.getCapsStruct() is null )
-            {
-
+.newline
-                continue;
-            }
-            else if( caps.getCapsStruct() is null )
-            {
-
+.newline
-                continue;
-            }
-                
-, pad.getName(), " : caps: ", caps.toString() )
+)( pad.getName())( " : caps: ")( caps.toString() ).newline
-            
-, (cast(double)pad.queryDuration()) / (cast(double)FRAME_25) )
+)( (cast(double)pad.queryDuration()) / (cast(double)FRAME_25) ).newline
-            
-            double pad_duration = (cast(double)pad.queryDuration()) / (cast(double)FRAME_25);
@@ -637 +746 @@
-                        found_video = true;
-                        currentVideoMaterial = new Material( current, MaterialType.VIDEO, pad_duration );
-addMaterial
+discovererAddMaterialMovie
-                        //TODO currentVideoMaterial.setAudioInfo(caps)
-                    }
@@ -645 +754 @@
-                        found_audio = true;
-                        currentAudioMaterial = new Material( current, MaterialType.AUDIO, pad_duration );
-addMaterial
+discovererAddMaterialMovie
-                        //TODO currentVideoMaterial.setVideoInfo(caps)
-                    }
@@ -656 +765 @@
-            //  try:
-                    //length, format = pad.query_duration(gst.FORMAT_TIME)
-
+.newline
-            
-            //  except:
@@ -677 +786 @@
-    protected bool newVideoPadCb( Pad pad, Element element )
-    {
-, current )
-, current )
+)( current ).newline
+)( current ).newline
-        //a new video pad was found
-, pad.getName() )
+)( pad.getName() ).newline
-
-        if( currentVideoMaterial !is null )
@@ -743 +852 @@
-    protected bool newAudioPadCb( Pad pad, Element unused_element )
-    {
-, current )
-, current )
+)( current ).newline
+)( current ).newline
-        //a new audio pad was found
-
-
-
-
+
+
+
+
+
-            currentAudioMaterial.materialType( MaterialType.AUDIO );
-        }
@@ -755 +865 @@
-        {
-            throw new Exception("Discoverer.newVideoPadCb() No currentVideoMaterial.");
-
+*/
-        //currentAudioMaterial.setAudio(True)
-        
@@ -762 +872 @@
-        if( found_video )
-        {
+            debug(Discoverer) Stdout("Discoverer.newAudioPadCb() Already found video, calling noMorePadsCb.").newline;
-            //gst.debug("already have video, calling no_more_pads")
-            noMorePadsCb(null);
@@ -768 +879 @@
-        if( pad.getCaps().isFixed() )
-        {
+            debug(Discoverer) Stdout("Discoverer.newAudioPadCb() Fixed caps.").newline;
-            //gst.debug("fixed caps, setting info on factory")
-            //currentVideoMaterial.setAudioInfo(pad.get_caps());
@@ -774 +886 @@
-        else
-        {
-non-fixed caps, adding queue and fakesink")
+Discoverer.newAudioPadCb() non-fixed caps, adding queue and fakesink").newline
-            ////         if not currentVideoMaterial.is_video:
-            // we need to add a fakesink
@@ -787 +899 @@
-            fakesink.setState( GstState.PAUSED );
-        }
-
+return false;
-    }
-/*
@@ -799 +911 @@
-    protected void newDecodedPadCb( Pad pad, Element element )//, element, pad, is_last)
-    {
-, current )
-, current )
+)( current ).newline
+)( current ).newline
-        
-        if( pad is null )
-        {
-
+.newline
-            return;
-        }
-        
-
+
+
+
-        double pad_duration = (cast(double)pad.queryDuration()) / (cast(double)FRAME_25);
-        
@@ -815 +929 @@
-            if( pad.getDirection() == GstPadDirection.SINK )
-            {
-
+.newline
-                return;
-            }
@@ -824 +938 @@
-            if( caps is null )
-            {
-
+.newline
-                trytogetnegcaps = true;
-            }
-            else if( caps.getCapsStruct() is null )
-            {
-
+.newline
-                trytogetnegcaps = true;
-            }
@@ -835 +949 @@
-            if( caps.isFixed() == false || trytogetnegcaps == true )
-            {
-
+.newline
-                caps = pad.getNegotiatedCaps();
-            }
@@ -841 +955 @@
-            if( caps is null )// || caps.getCapsStruct() is null )
-            {
-
+.newline
-                return;
-            }
-            else if( caps.getCapsStruct() is null )
-            {
-
+.newline
-                return;
-            }
-                
-, pad.getName(), " : caps: ", caps.toString() )
+)( pad.getName() )( " : caps: " )( caps.toString() ).newline
-            
-        
@@ -857 +971 @@
-        //   create one, emit "new_sourcefile_factory"
-        char[] capsstr = caps.toString();//pad.getCaps().toString();
-, pad.getName(), " caps:", capsstr, " is_last:")
+ )( pad.getName() )( " caps:" )( capsstr )( " is_last:").newline
-        if( Util.containsPattern( capsstr, "video" ) == true )
-        {
-, current )
+)( current ).newline
-            //capsstr.startswith("video/x-raw"):
-            //if( currentVideoMaterial is null )
@@ -869 +983 @@
-            if( found_video == false )
-            {
-
+.newline
-                found_video = true;
-                currentVideoMaterial = new Material( current, MaterialType.VIDEO, pad_duration );
-addMaterial
-
+discovererAddMaterialMovie
+.newline
-                //TODO currentVideoMaterial.setAudioInfo(caps)
-            }
@@ -880 +994 @@
-        else if( Util.containsPattern( capsstr, "audio" ) == true )
-        {
-, current )
+)( current ).newline
-            //capsstr.startswith("audio/x-raw")
-            //if( currentAudioMaterial is null )
@@ -889 +1003 @@
-            if( found_audio == false )
-            {
-
+.newline
-                found_audio = true;
-                currentAudioMaterial = new Material( current, MaterialType.AUDIO, pad_duration );
-addMaterial
+discovererAddMaterialMovie
-                //TODO currentAudioMaterial.setVideoInfo(caps)
-
+