Changeset 10

Timestamp:

04/20/07 09:30:57 (2 years ago)

Author:

satelliittipupu

Message:

A commit for backup before I do some big changes with SceneChain? and Scene.

Files:

• trunk/pihlaja/src/build/pihlaja.brf (modified) (1 diff)
• trunk/pihlaja/src/pihlaja/core/discoverer.d (modified) (4 diffs)
• trunk/pihlaja/src/pihlaja/core/edit.d (modified) (1 diff)
• trunk/pihlaja/src/pihlaja/core/material.d (modified) (5 diffs)
• trunk/pihlaja/src/pihlaja/core/movie.d (modified) (8 diffs)
• trunk/pihlaja/src/pihlaja/core/project.d (modified) (8 diffs)
• trunk/pihlaja/src/pihlaja/core/scene.d (modified) (9 diffs)
• trunk/pihlaja/src/pihlaja/core/scenechain.d (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/core/track.d (modified) (1 diff)
• trunk/pihlaja/src/pihlaja/pihlajamain.d (modified) (3 diffs)
• trunk/pihlaja/src/pihlaja/ui/materialstreeview.d (modified) (4 diffs)
• trunk/pihlaja/src/pihlaja/ui/projectchooser.d (modified) (3 diffs)
• trunk/pihlaja/src/pihlaja/ui/projectwindow.d (modified) (5 diffs)

trunk/pihlaja/src/build/pihlaja.brf

@@ -6 +6 @@
-#-v
-#-debug=15
-
-
+
+
+
--debug=Pihlaja
--debug=Project
--debug=Movie
--debug=Scene
-
+#
--debug=SceneChain
-
-
+#
+#
-#-debug=Render
-#-debug=Invalidation

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

@@ -632 +632 @@
-                        found_video = true;
-                        currentVideoMaterial = new Material( current, MaterialType.VIDEO, pad_duration );
-new
+add
-                        //TODO currentVideoMaterial.setAudioInfo(caps)
-                    }
@@ -640 +640 @@
-                        found_audio = true;
-                        currentAudioMaterial = new Material( current, MaterialType.AUDIO, pad_duration );
-new
+add
-                        //TODO currentVideoMaterial.setVideoInfo(caps)
-                    }
@@ -867 +867 @@
-                found_video = true;
-                currentVideoMaterial = new Material( current, MaterialType.VIDEO, pad_duration );
-new
+add
-                debug(Discoverer) writefln("Discoverer.newDecodedPadCb() Creating new video material. DONE.");
-                //TODO currentVideoMaterial.setAudioInfo(caps)
@@ -887 +887 @@
-                found_audio = true;
-                currentAudioMaterial = new Material( current, MaterialType.AUDIO, pad_duration );
-new
+add
-                //TODO currentAudioMaterial.setVideoInfo(caps)
-                debug(Discoverer) writefln("Discoverer.newDecodedPadCb() Creating new audio material. DONE.");

trunk/pihlaja/src/pihlaja/core/edit.d

@@ -188 +188 @@
-        parent_node.addChild( edit_node );
-        edit_node.setAttribute( "name", name );
-x", x
-y", y
-w", w );
-
+start", start
+duration", duration
+y", y );//This might not be needed and maybe it should be removed.
+//This might not be needed and maybe it should be removed.
-        //This isn't needed as the Track is known: edit_node.setAttribute( "trackNumber", trackNumber() );
-        //This isn't needed as the Track is known: edit_node.setAttribute( "mediaType", track.mediaTypeString() );
-        edit_node.setAttribute( "mediaStart", mediaStart );
-        edit_node.setAttribute( "mediaDuration", mediaDuration );
-
+edit_node.setAttribute( "materialID", material.id );
-        
-    }

trunk/pihlaja/src/pihlaja/core/material.d

@@ -16 +16 @@
-private import gstreamerc.gstreamertypes;
-
+//PTL imports:
+private import ptl.xml;
+
-//Pihlaja imports:
-
@@ -29 +32 @@
-    VIDEO,
-    AUDIO,
-
-
-
-
+//TODO
+//TODO
+//TODO
+//TODO
-}
-
@@ -49 +52 @@
-public:
-
+    public char[] id() { return m_id; }
+    protected char[] id( char[] set ) { return m_id = set; }
+    protected char[] m_id;
+    
-    this( char[] fnam, MaterialType set_mater_type, double set_duration )// = "untitled" )
-    {
@@ -55 +62 @@
-
-        debug(Discoverer) writefln("Creating new Material: ", fnam );
+        
+        id = std.string.toString( cast(size_t)cast(void*)this );
-        
-        /*
@@ -76 +85 @@
-        mediaDuration = set_duration; //* 25.0;
-
+    }
+
+    static Material load003( XmlNode xml_node )
+    {
+        Material empty = new Material( xml_node.getAttribute( "filename" ), materialTypeFromString( xml_node.getAttribute( "materialType" ) ), std.string.atof( xml_node.getAttribute( "mediaDuration" )) );
+        
+        /*XmlNode[] child_nodes = xml_node.getChildren();
+            
+        foreach( XmlNode ch_node; child_nodes )
+        {
+            if( ch_node.getName() == "SceneChain")
+            {
+                debug(loading) writefln("-  Found SceneChain.");
+                sceneChain.pushBack( SceneChain.load003( this, ch_node ) );
+            }
+        }*/
+        
+        return empty;
+    
+    }
+
+    void save003( XmlNode parent_node )
+    {
+        XmlNode material_node = new XmlNode("Material");
+        parent_node.addChild( material_node );
+        material_node.setAttribute( "id:", id );
+        material_node.setAttribute( "filename", filename );
+        material_node.setAttribute( "mediaStart", mediaStart );
+        material_node.setAttribute( "mediaDuration", mediaDuration );
+        material_node.setAttribute( "materialType", materialTypeString() );
+        
+    }
+
+    static MaterialType materialTypeFromString( char[] from )
+    {
+        if( from == "video" )
+            return MaterialType.VIDEO;
+        else if( from == "audio" )
+            return MaterialType.AUDIO;
+        else if( from == "music" )
+            return MaterialType.MUSIC;
+        else if( from == "image" )
+            return MaterialType.IMAGE;
+        else if( from == "image_sequence" )
+            return MaterialType.IMAGE_SEQUENCE;
+        else if( from == "link" )
+            return MaterialType.LINK;
+        return MaterialType.NONE;
+    }
+
+    char[] materialTypeString()
+    {
+        if( materialType == MaterialType.VIDEO )
+            return "video";
+        else if( materialType == MaterialType.AUDIO )
+            return "audio";
+        else if( materialType == MaterialType.MUSIC )
+            return "music";
+        else if( materialType == MaterialType.IMAGE )
+            return "image";
+        else if( materialType == MaterialType.IMAGE_SEQUENCE )
+            return "image_sequence";
+        else if( materialType == MaterialType.LINK )
+            return "link";
+        return "none";
-    }
-

trunk/pihlaja/src/pihlaja/core/movie.d

@@ -61 +61 @@
-{
-public:
- 
+_
-    {
-        debug(Movie) writefln("Movie.this() START.");
@@ -77 +77 @@
-        
-        m_name = set_name;
- 
+_
-            m_name = m_name ~ std.string.toString( count_times );
-        
@@ -83 +83 @@
-        
-        pipeline = new Pipeline( "movie-pipeline" ~ std.string.toString( count_times ) );
+        
+        SceneChain empty_chain = new SceneChain( this );
+        startScene = new StartScene( this, empty_chain );
+        sceneChain.pushBack( empty_chain );
+        addItem( startScene );
+        startScene.addOnEvent( &onSceneEvent );
-        
-/*
@@ -135 +141 @@
-        selectedSceneChains = new List!(LinkableScene);
-        
+    } 
+    
+    static Movie load003( Project set_project, XmlNode xml_node )
+    {
+        Movie empty = new Movie( set_project, xml_node.getAttribute( "name" ) );
+        
+        XmlNode[] child_nodes = xml_node.getChildren();
+            
+        foreach( XmlNode ch_node; child_nodes )
+        {
+            if( ch_node.getName() == "SceneChain")
+            {
+                debug(loading) writefln("-  Found SceneChain.");
+                empty.sceneChain.pushBack( SceneChain.load003( empty, ch_node ) );
+            }
+        }
+    
+        return empty;
-    }
-    
@@ -154 +178 @@
-        //createTestScene();
-        
-        SceneChain empty_chain = new SceneChain( this );
-        startScene = new StartScene( this, empty_chain );
-        sceneChain.pushBack( empty_chain );
-        addItem( startScene );
-        startScene.addOnEvent( &onSceneEvent );
-        selectedScene = startScene;
-
@@ -194 +213 @@
-        count_create_test_scene_number++;
-        
- 
- Scene 
+_
+_Scene_
-        //newTrack( MediaType.VIDEO, false, "Video 2" );
-        
@@ -777 +796 @@
-    }
-
+    Scene addScene( Scene empty )
+    {
+        addItem( empty );
+        scene.pushBack( empty );
+        empty.addOnEvent( &onSceneEvent );
+        return empty;
+    }
+
-    Scene newScene( double sx1 = 0.0, double sy1 = 0.0, double sx2 = 30.0, double sy2 = 30.0, String set_name = "Empty Scene" )
-    {
@@ -2044 +2071 @@
-    Element audio1;*/
-
-
+
+
+
-
-    LinkableScene m_selectedScene;

trunk/pihlaja/src/pihlaja/core/project.d

@@ -497 +497 @@
-        discoverer = new Discoverer(this);
-
-
+//
-
-    }
@@ -511 +511 @@
-    {
-        currentVersion++;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -529 +579 @@
-        project_node.setAttribute( "currentVersionFilename", currentVersionFilename );
-        
+        foreach( Material mat; material )
+        {
+            mat.save003( project_node );
+        }
+        
-        foreach( Movie mov; movie )
-        {
@@ -576 +631 @@
-    }
-    
+    abstract protected void addMovieToBin( Movie set_movie );
+    
+    Movie addMovie( Movie set_movie )
+    {
+        debug(Project) writefln("Project.addMovie(Movie) START.");
+        debug(Project) scope(exit) writefln("Project.addMovie(Movie) END.");
+        
+        movie.pushBack( set_movie );
+        selectedMovie = set_movie;
+        addMovieToBin( set_movie );
+        return set_movie;
+    }
+    
-    Movie newMovie()
-    {
@@ -582 +650 @@
-        
-        Movie empty = new Movie( this );
-
-
+
+
+
-        return empty;
-    }
@@ -612 +681 @@
-        Material mat3 = new Material( "/home/joonaz/sax.ogg", MaterialType.AUDIO, 10.0 * 25.0 );
-        
-new
-new
-new
-new
+add
+add
+add
+add
-    
-    }
@@ -631 +700 @@
-    }
-    
-new
-
-new
-new
+add
+
+add
+add
-        
-        //Material empty = new Material( filenam, typ );
@@ -732 +801 @@
-    
-    char[] projectDir;
-
+
+
-    uint currentVersion = 0;//This is the current version of the project.
-    //It is incremented everytime saving occurs.

trunk/pihlaja/src/pihlaja/core/scene.d

@@ -111 +111 @@
-    }*/
-    
-100.0, double sh = 10
+200.0, double sh = 12
-    {
-        super( sx, sy, sw, sh, set_name );
@@ -673 +673 @@
-            return m_nextScene = set;
-    }
-
-
-rotected
+public 
+
+ublic
-    {
-        //set.moveTo( x2, y );
@@ -681 +681 @@
-        return m_beforeScene = set;
-    }
-rotected
+ublic
-
-    /*class SceneChain
@@ -1090 +1090 @@
-    */
-    public double sourceStart() { return m_sourceStart; }
-rotected
+ublic
-    {
-        m_sourceStart = set;
@@ -1464 +1464 @@
-    //The nextScene is positioned to the right of this scene, and it follows this
-    //scene unless SHIFT is pressed (then it will be removed from the chain).
+    public bool isLinkNextScene( bool set ) { return m_isLinkNextScene = set; }
-    public bool isLinkNextScene() { return m_isLinkNextScene; }
-    protected bool m_isLinkNextScene = false;
-    protected LinkableScene m_nextScene;
+    public bool isLinkBeforeScene( bool set ) { return m_isLinkBeforeScene = set; }
-    public bool isLinkBeforeScene() { return m_isLinkBeforeScene; }
-    protected bool m_isLinkBeforeScene = false;
@@ -1624 +1626 @@
-        scene_node.setAttribute( "w", w );
-        scene_node.setAttribute( "h", h );
+        scene_node.setAttribute( "isLinkNextScene", isLinkNextScene() );
+        
-        
-    }
@@ -2017 +2021 @@
-    }
-
-100.0, double sh = 10
+200.0, double sh = 12
-    {
-        debug(3) writefln("Scene.this(...) START.");
@@ -2034 +2038 @@
-    }
-*/
+
+    static Scene load003( Movie set_movie, SceneChain set_scene_chain, XmlNode xml_node )
+    {
+        Scene empty = new Scene( set_movie, set_scene_chain,
+            std.string.atof( xml_node.getAttribute( "x" ) ),
+            std.string.atof( xml_node.getAttribute( "y" ) ),
+            std.string.atof( xml_node.getAttribute( "w" ) ),
+            std.string.atof( xml_node.getAttribute( "h" ) ),
+            xml_node.getAttribute( "name" ) );
+        //xml_node.getAttribute( "filename" ), materialTypeFromString( xml_node.getAttribute( "materialType" ) ), std.string.atof( xml_node.getAttribute( "mediaDuration" )) );
+        //empty.name = ;
+        //empty.x = ;
+        char[] is_link_next_string = xml_node.getAttribute( "isLinkNextScene" );
+        if( is_link_next_string == "true" )
+            empty.isLinkNextScene = true;
+        else if( is_link_next_string == "false" )
+            empty.isLinkNextScene = false;
+        else writefln("Error while loading Scene. isLinkNextScene is neither true or false.");
+        
+        /*
+        XmlNode[] child_nodes = xml_node.getChildren();
+            
+        foreach( XmlNode ch_node; child_nodes )
+        {
+            if( ch_node.getName() == "StartScene")
+            {
+                debug(loading) writefln("-  Found StartScene.");
+                //empty.pushBack( Scene.load003( set_movie, empty, ch_node ) );
+            }
+            
+            if( ch_node.getName() == "Scene")
+            {
+                debug(loading) writefln("-  Found Scene.");
+                empty.pushBack( Scene.load003( set_movie, empty, ch_node ) );
+            }
+        }*/
+        
+        return empty;
+    
+    }
+
-    void save003( XmlNode parent_node )
-    {
@@ -2043 +2088 @@
-        scene_node.setAttribute( "w", w );
-        scene_node.setAttribute( "h", h );
+        scene_node.setAttribute( "isLinkNextScene", isLinkNextScene() );
-        
-        foreach( Track tr; track )

trunk/pihlaja/src/pihlaja/core/scenechain.d

@@ -87 +87 @@
-    }
-    
+    static SceneChain load003( Movie set_movie, XmlNode xml_node )
+    {
+        SceneChain empty = new SceneChain( set_movie );
+        //xml_node.getAttribute( "filename" ), materialTypeFromString( xml_node.getAttribute( "materialType" ) ), std.string.atof( xml_node.getAttribute( "mediaDuration" )) );
+        
+        XmlNode[] child_nodes = xml_node.getChildren();
+            
+        foreach( XmlNode ch_node; child_nodes )
+        {
+            if( ch_node.getName() == "StartScene")
+            {
+                debug(loading) writefln("-  Found StartScene.");
+            /*  //empty.pushBack( Scene.load003( set_movie, empty, ch_node ) );
+                
+                StartScene str = set_movie.startScene();
+                
+                set_movie.startScene.x = std.string.atof( ch_node.getAttribute( "x" ) );
+                set_movie.startScene.y = std.string.atof( ch_node.getAttribute( "y" ) );
+                set_movie.startScene.w = std.string.atof( ch_node.getAttribute( "w" ) );
+                set_movie.startScene.h = std.string.atof( ch_node.getAttribute( "h" ) );
+                
+                char[] is_link_next_string = ch_node.getAttribute( "isLinkNextScene" );
+                if( is_link_next_string == "true" )
+                    set_movie.startScene.isLinkNextScene = true;
+                else if( is_link_next_string == "false" )
+                    set_movie.startScene.isLinkNextScene = false;
+                else writefln("Error while loading StartScene. isLinkNextScene is neither true or false.");
+                
+                str.sceneChain.remove( str );
+                empty.pushBack( str );
+            */  
+            }
+            
+            /*if( ch_node.getName() == "Scene")
+            {
+                debug(loading) writefln("-  Found Scene.");
+                Scene scn = Scene.load003( set_movie, empty, ch_node );
+                //empty.pushBack( scn );
+                //set_movie.addScene( scn );
+            }*/
+        }
+        
+        //empty.updateSceneChain();
+        
+        return empty;
+    
+    }
+    
-    void save003( XmlNode parent_node )
-    {
@@ -97 +145 @@
-            scn.save003( scene_chain_node );
-        }
+        
+    }
+    
+    /** 
+    * updateSceneChain updates the linkedlist kind of
+    * structure (the nextScene and beforeScene members of each scene in the sceneChain list).
+    * This is called atleast after addToSceneChain.
+    */
+    protected void updateSceneChain( bool select_this_scene = false )
+    {
+        debug(SceneChain) writefln("SceneChain.updateSceneChain() START." );
+        debug(SceneChain) scope(exit) writefln("SceneChain.updateSceneChain() END.");
+        
+            LinkableScene bef = null;
+            LinkableScene first = first();
+            debug(SceneChain) writefln("sceneChain.first.name: ", first.name() );
+            double current_frame = 0.0;
+            
+            //This will remove the current scene.gnlCompositions from the pipelinePlayer.
+            //and put our first scene there. Also "reallyselects" the first scene.
+            //CHECK: should this behaviour be optional... because of splitSceneChain calling updateSceneChain too.
+            //Now it's optional.
+            if( select_this_scene == true && movie !is null)
+            {
+                //CHANGED FROM movie.selectedScene = cast(LinkableScene) first;
+                //TO
+                movie.deselectAll();
+                movie.setIsSelectedOne( cast(CanvasItem) first, true );
+            }
+            
+            foreach( LinkableScene item; this )
+            {
+                if( bef !is null )
+                {
+                    debug(SceneChain) writefln("SceneChain.updateSceneChain() in the loop.");
+                
+                    item.sceneChain = this;//bef.sceneChain;
+                    bef.nextScene = item;
+                    item.beforeScene = bef;
+                    
+                    if( bef.isLinkNextScene == false && item.isLinkBeforeScene == false )
+                    {
+                        double item_delta_x = bef.x2 - item.x;
+                        double item_delta_y = bef.cy - item.cy;
+                        item.moveR( item_delta_x, item_delta_y );
+                    }
+                    else if( bef.isLinkNextScene == true && item.isLinkBeforeScene == true )
+                    {
+                        
+                    }
+                    else if( bef.isLinkNextScene == true )
+                    {
+                        item.isLinkBeforeScene = true;
+                    }
+                    else
+                    {
+                        writefln("Scene.updateSceneChain() Error: m_isLinkNextScene and m_isLinkBeforeScene don't match.");
+                    }
+                    
+                }
+                bef = item;
+                
+                debug(SceneChain) writefln("updateSceneChain() updating masterScene.");
+                
+                //gstreamer/gnonlin part:
+                //This will put the gnlSources of all the scenes inside the ownGnlCompositions
+                //of the first scene in the sceneChain.
+                //(cast(LinkableScene)
+                item.masterScene( first );
+                
+                
+                debug(SceneChain) writefln("updateSceneChain() updating sourceStart.");
+                //and this will change the sources starting positions so that they
+                //follow each other.
+                //(cast(LinkableScene)
+                item.sourceStart = current_frame;
+                
+                debug(SceneChain) writefln("updateSceneChain() setting current_frame += item.duration.");
+                current_frame += item.duration();
+            }
-        
-    }

trunk/pihlaja/src/pihlaja/core/track.d

@@ -232 +232 @@
-        (cast(Edit)it).fileSourceCopy().ref();//CHECK if this makes any sense gstreamer remove/ref.
-        (cast(Bin) m_gnlComposition).remove( (cast(Edit)it).fileSourceCopy() );
-
+
-    }
-

trunk/pihlaja/src/pihlaja/pihlajamain.d

@@ -105 +105 @@
-    {
-        splashScreen.okToHide = true;
+        
-    }
-    
@@ -118 +119 @@
-    }
-    
-new
+open
-    {
-        debug(Project) writefln("Pihlaja.newProject() START.");
@@ -131 +132 @@
-        
-        ProjectWindow empty = new ProjectWindow( this );
+        //empty.load003( name, projectDir );
-        empty.setNameAndProjectDir( name, projectDir );
+        empty.load003();
-        project.pushBack( empty );
-        //selectedProject = empty;

trunk/pihlaja/src/pihlaja/ui/materialstreeview.d

@@ -27 +27 @@
-private import pihlaja.core.globals;
-
+private import pihlaja.core.movie;
-private import pihlaja.core.material;
-
@@ -43 +44 @@
-
-    Image binImage;
+    Image movieImage;
-    Image materialImage;
-    //Pixbuf pixbuf;
@@ -77 +79 @@
-        newImageScaled( binImage, g_themeDir ~ "/icons/bin.png", -1, 18 );
-        newImageScaled( materialImage, g_themeDir ~ "/icons/material.png", -1, 18 );
+        newImageScaled( movieImage, g_themeDir ~ "/icons/movie.png", -1, 18 );
-        
-        //pixbuf = new Pixbuf(greenClass_xpm);
@@ -150 +153 @@
-        
-        selectedBin = materialTreeStore.append( iterTop );  
+    }
+    
+    void addMovie( Movie set_movie )
+    {
+        debug(Discoverer) writefln("MaterialsTreeview.addMovie() Putting the movie to the bin.\n");
+        //TreeIter iterTop = materialTreeStore.createIter();
+        TreeIter iterChild;
+        
+        iterChild = materialTreeStore.append( selectedBin );
+        materialTreeStore.setValue( iterChild, 0, movieImage.getPixbuf() );//new Pixbuf( material_xpm) );
+        materialTreeStore.setValue( iterChild, 1, set_movie.name() );
-    }
-    

trunk/pihlaja/src/pihlaja/ui/projectchooser.d

@@ -212 +212 @@
-    void onSkip( Button unused_button )
-    {
-
+
+
-        
-        char[] name = "Empty";
@@ -220 +221 @@
-        writefln("name: ", name, " projectDir: ", projectDir );
-        
-
+*/
-    }
-    
@@ -227 +228 @@
-        hide();
-        
-
+
+
+
+
+
-        char[] projectDir = std.path.addExt( getAbsoluteDir( g_projectDir ~ std.path.sep ~ std.string.tolower( std.string.replace( name, " ", "_" ) ) ), "pihlaja" );
-        
-        writefln("name: ", name, " projectDir: ", projectDir );
-        
-new
+open
-    }
-    

trunk/pihlaja/src/pihlaja/ui/projectwindow.d

@@ -114 +114 @@
-        
-        window.addOnKeyPress( &onKeyPress );
-
+
+
-
-    debug(Pihlaja) writefln("Pihlaja.this() creating maingvbox.");
@@ -311 +312 @@
-
-
-monitor
+timeline
-        timelineVBox.packStart( timelineButtonsHBox, false, false, 0 );
-        
-
+//
-
-    debug(Pihlaja) writefln("Pihlaja.this() creating timeline_sliders_hbox.");
@@ -439 +440 @@
-    }*/
-    
+    void onWindowRealize( Widget unused_window )
+    {
+        //load003(); //name, projectDir );
+    }
+    
+    void load003()// char[] set_name, char[] set_project_dir )
+    {
+        //writefln("Trying to open project ", set_name, " from project directory: ", set_project_dir );
+        
+        //setNameAndProjectDir( set_name, set_project_dir );
+        
+        writefln("Trying to open project ", name, " from project directory: ", projectDir );
+        
+        if( std.file.exists( currentFilename ) == true )
+        {
+            writefln("Current version exists. Trying to open it.");
+            std.stream.File file = new File( currentFilename, FileMode.In );
+            super.load003( file );
+            file.close();
+        }
+        else
+        {
+            writefln("Project file doesn't exist. This is a new project.");
+        }
+    }
+    
-    void save003()
-    {
@@ -474 +501 @@
-        if( std.file.exists( projectDir ) == true )
-        {
+            if( std.file.exists( "current.pihlajaproject" ) == true )
+            {
+                writefln("Current version exists.");
+                //currentVersionAdd();
+            }
+        
-            while( std.file.exists( currentVersionFilename ) == true )
-            {
@@ -807 +840 @@
-
-        return true;
+    }
+
+    //overloaded from Project
+    void addMovieToBin( Movie set_movie )
+    {
+        if( materialsTreeview !is null )
+            materialsTreeview.addMovie( set_movie );
+    }
+
+    public Movie selectedMovie() { return super.selectedMovie(); }
+    public Movie selectedMovie( Movie set )
+    {
+        if( timelineVBox !is null && selectedMovie !is null )
+        {
+            timelineVBox.remove( selectedMovie );
+        }
+        super.selectedMovie( set );
+        if( timelineVBox !is null )
+        {
+            timelineVBox.packStart( selectedMovie, true, true, 0);
+            selectedMovie.show();
+        }
+        return set;
-    }
-