Changeset 21

Timestamp:

07/26/07 08:18:16 (1 year ago)

Author:

satelliittipupu

Message:

EditGroups? are now better. Saving and loading editGroups works too.

Files:

• trunk/pihlaja/src/pihlaja/core/edit.d (modified) (12 diffs)
• trunk/pihlaja/src/pihlaja/core/material.d (modified) (3 diffs)
• trunk/pihlaja/src/pihlaja/core/project.d (modified) (6 diffs)
• trunk/pihlaja/src/pihlaja/core/scene.d (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/ui/materialstreeview.d (modified) (4 diffs)
• trunk/pihlaja/src/pihlaja/ui/projectwindow.d (modified) (14 diffs)

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

@@ -64 +64 @@
-
-    //mixin PlaybackBin; //No. Not this.
+    
+    public char[] id() { return m_id; }
+    public char[] id( char[] set ) { return m_id = set; }
+    protected char[] m_id;
-
-    //Notice that the order is x, W, y, h and not the usual x, y, W, h. Width is the second argument.
@@ -71 +75 @@
-        debug(Edit) Stdout("Edit.this() START.").newline;
-        debug(Edit) scope(exit) Stdout("Edit.this() END.").newline;
+
+        id = Integer.toUtf8( cast(size_t)cast(void*)this );
-
-        m_scene = set_scene;
@@ -219 +225 @@
-    {
-        xw.startElement("Edit");
+            xw.addAttribute( "id", id );
-            xw.addAttribute( "name", name );
-            xw.addAttribute( "start", Float.toUtf8(start) );
@@ -228 +235 @@
-            xw.addAttribute( "mediaStart", Float.toUtf8(mediaStart) );
-            xw.addAttribute( "mediaDuration", Float.toUtf8(mediaDuration) );
-
+
+
+
+
-        xw.endElement("Edit");
-    }
@@ -254 +264 @@
-            debug(loading) Stdout("updateAll() Wen't fine.").newline;
-        }
+        
+        updatePipelineStart();
+        updatePipelineDuration();
-    }
-
@@ -608 +621 @@
-    }*/
-
-D
+d
-    Material material(){ return m_material; }
-    Material material( Material set )
@@ -707 +720 @@
-    }*/
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    void addToEditGroup( Edit set )
-    {
@@ -721 +852 @@
-                {
-                    debug(EditGroup) Stdout("Edit.addToEditGroup(Edit ed) neither of them has an editGroup. We'll create a new one.");
-
+EditGroup();//
-                    set.editGroup = editGroup;
-
@@ -735 +866 @@
-                }
-            }
- chain
+n editGroup
-            {
-                if( editGroup is null )//but this doesn't, so we'll just add this to set.chain.
@@ -746 +877 @@
-                else if( set.editGroup is editGroup )
-                {
-sceneChain
+editGroup
-                    debug(EditGroup) Stdout( "Edit.addToEditGroup() set.editGroup is editGroup. They already are synced into the same group.'" );
-                }
@@ -756 +887 @@
-                    //because it will get changed away in the
-                    //foreach loops. Atleast it should:
-
-
-
-
-
-
-
-
+
-                }
-            }
@@ -799 +923 @@
-    //the properties correctly.
-
-    LinkSeq!(Edit) m_editGroup;
-    
-    public uint numberOfVisibleHandles() { return m_numberOfVisibleHandles; }
-    public uint numberOfVisibleHandles( uint set )

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

@@ -289 +289 @@
-            xw.addAttribute( "name", name );
-            if( linkMovie !is null )
-D
-D
+d
+d
-            xw.addAttribute( "mediaStart", Float.toUtf8(mediaStart) );
-            xw.addAttribute( "mediaDuration", Float.toUtf8(mediaDuration) );
@@ -307 +307 @@
-            if( linkMovie is null )
-            {
-D( linkMovieID
+d( linkMovieId
-                if( linkMovie is null )
-                {
-D. Project loading has failed. linkMovieID:")(linkMovieID
+d. Project loading has failed. linkMovieId:")(linkMovieId
-                }
-                else
@@ -578 +578 @@
-    {
-        if( set !is null )
-D
+d
-        return m_linkMovie = set;
-    }
-    public Movie linkMovie() { return m_linkMovie; }
-    protected Movie m_linkMovie;
-D
+d
-    
-    //This might be a good idea to keep a list of Edits that use this Material:

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

@@ -647 +647 @@
-    }
-    
-D
-
-D
-D
+d
+
+d
+d
-        
-        Movie res;
@@ -660 +660 @@
-        if( res !is null )
-        {
-D
+d
-            return res;
-        }
-        else
-        {
-D
+d
-        }
-        return null;
-    }
-    
-D
-
-D
-D
-
-D
+d
+
+d
+d
+
+d
-        
-        if( res !is null )
-        {
-D
+d
-            selectedMovie( res );
-        }
-        else
-        {
-D
+d
-        }
-        return res;
@@ -1344 +1344 @@
-                xw.addAttribute( "projectDir", projectDir );
-                xw.addAttribute( "lastVersionFilename", lastVersionFilename );
-D
+d
-                
-                foreach( Material mat; material )
@@ -1604 +1604 @@
-    }
-    
-D
+d
-    {
-        debug(Project) Stdout("Project.getMaterialById(char[] find_id) START.").newline;
@@ -1707 +1707 @@
-    //It is incremented everytime saving occurs.
-    
-D
-
-D
+d
+
+d
-        
-        /*
@@ -1716 +1716 @@
-        if( res !is null )
-        {
-D
+d
-            m_currentlyDraggedMovie = res;
-        }
-        else
-        {
-D
+d
-        }*/
-    }

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

@@ -1538 +1538 @@
-        sceneChain.append( this );
-        
-
+
+
+
-        applyMainColour();
-        
@@ -5058 +5060 @@
-    SceneRuler ruler;
-
-
+public 
-    LinkSeq!(Edit) selectedEdits;//TODO: this should be changed into some kind of a Hash thing.
-    public TrackContainer!(Track) track;//This is duplicating the data found from "this".RTree

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

@@ -151 +151 @@
-        debug(Discoverer) Stdout("drag name: ")( col_name.getString() )(" id: ")( col_id.getString() ).newline;
-        
-D
+d
-        
-        if( drmov.movieType == MovieType.NORMAL )
@@ -187 +187 @@
-                debug(Discoverer) Stdout("tree name: ")( col_name.getString() )(" id: ")( col_id.getString() ).newline;
-                
-D
+d
-                
-                m_treeStore.setValue( iter, MaterialColumnType.DURATION, g_toTimecode( mov.duration() ) );
@@ -221 +221 @@
-        debug(Discoverer) Stdout("activated name: ")( col_name.getString() )(" id: ")( col_id.getString() ).newline;
-        
-D
+d
-    }
-    
@@ -368 +368 @@
-        ++col;
-        
-D
+d
-        treeView.appendColumn(column);
-        column.setResizable(true);

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

@@ -828 +828 @@
-            
-            //Project
-D
+d
-            
-            //Material:
@@ -836 +836 @@
-            char[] l_materialType = "";
-            char[] l_filename = "";
-D
+d
-            char[] l_mediaStart = "";
-            char[] l_mediaDuration = "";
@@ -876 +876 @@
-            //char[] l_mediaStart = "";
-            //char[] l_mediaDuration = "";
-
-
+
+
+
-            this( Project set_project )
-            {
@@ -918 +919 @@
-                            l_currentMaterial.id = l_id;
-                            l_currentMaterial.loadedName = l_name;
-D = l_linkMovieID
+d = l_linkMovieId
-                            l_currentMaterial.mediaDuration = Float.toFloat!(T)(l_mediaDuration);
-                            l_project.addMaterial(l_currentMaterial);
@@ -944 +945 @@
-                        foreach( mat; material )
-                        {
-D
+d
-                            {
-                                if( mat.trackType == TrackType.VIDEO )
@@ -1092 +1093 @@
-                        if( l_currentScene !is null )
-                        {
-D( l_materialID
+d( l_materialId
-                            l_currentEdit = new Edit( l_currentScene, ed_mat, Float.toFloat!(T)(l_start), Float.toFloat!(T)(l_duration) );
-D = materialID
+d = materialId
-                            l_currentScene.addEdit( l_currentEdit, l_currentTrack );
+                            l_currentEdit.addToEditGroupById( l_editGroupId );
-                            l_element = "";
-                        }
@@ -1103 +1105 @@
-                        }
-                    break;
-
+
+
+
+
+
+
+
-                
-                }//end switch set_name
@@ -1124 +1132 @@
-                    default: break;
-                    //Project
-
-
+
+
+
-                    break;
-                    //Material
@@ -1137 +1146 @@
-                        l_filename = value;
-                    break;
-
-
+
+
+
-                    break;
-                    case "mediaStart":
@@ -1205 +1215 @@
-                    break;
-                    //Edit
+                    
-                    case "start":
-                        l_start = value;
@@ -1211 +1222 @@
-                        l_duration = value;
-                    break;
-
-
-
+
+
+
+
+
+
+
+
-                }
-            }
@@ -1228 +1244 @@
-                    break;
-                    //case "Movie":
-D
+d
-                        //l_selectedMovie
-                    //break;
-                    case "Project":
-D( l_selectedMovieID
+d( l_selectedMovieId
-                        version(Removed) sel_mov.selectStartScene();
-                        
@@ -1469 +1485 @@
-    {
-        //showFileChooser();
-
+//
-        //onMenuActivate(menuItem);
+        
+        if( save() == true )
+            statusbar( "Saving complete. Saved version " ~ Integer.toUtf8( currentVersion ) );
+        else statusbar( "Saving FAILED for some reason. Current version " ~ Integer.toUtf8( currentVersion ) );
-    }
-    
@@ -1476 +1496 @@
-    {
-        //showFileChooser();
-
+//
-        //onMenuActivate(menuItem);
+        
+        if( save() == true )
+            statusbar( "Saving complete. Saved version " ~ Integer.toUtf8( currentVersion ) );
+        else statusbar( "Saving FAILED for some reason. Current version " ~ Integer.toUtf8( currentVersion ) );
-    }
-