Changeset 39

Timestamp:

04/02/08 06:44:59 (8 months ago)

Author:

kaarna

Message:

No more crashes (less anyway). VideoViewer? widget. Resizable windows.

Files:

• trunk/pihlaja/src/dsss.conf (modified) (2 diffs)
• trunk/pihlaja/src/pihlaja/PihlajaMain.d (modified) (26 diffs)
• trunk/pihlaja/src/shiraz/av/AudioFileQT.d (modified) (5 diffs)
• trunk/pihlaja/src/shiraz/av/PortAudioPlaybackCore.d (modified) (9 diffs)
• trunk/pihlaja/src/shiraz/canvas/Bezier.d (modified) (2 diffs)
• trunk/pihlaja/src/shiraz/canvas/Draw.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/canvas/Image.d (modified) (3 diffs)
• trunk/pihlaja/src/shiraz/canvas/PlainRectangle.d (modified) (12 diffs)
• trunk/pihlaja/src/shiraz/canvas/Rectangle.d (modified) (11 diffs)
• trunk/pihlaja/src/shiraz/ui/Button.d (modified) (1 diff)
• trunk/pihlaja/src/shiraz/ui/SubWindow.d (modified) (8 diffs)

trunk/pihlaja/src/dsss.conf

@@ -31 +31 @@
-    #Another but: but it will crash without it too.
-    #We need to not do anything else while playing?
-
+#
-
-##debugs:
@@ -37 +37 @@
-    buildflags += -debug=logging
-    
-
+
+
+
-    #buildflags += -debug=Shiraz
-    #buildflags += -debug=ProjectWindow

trunk/pihlaja/src/pihlaja/PihlajaMain.d

@@ -64 +64 @@
-
-
-
+Widget, public 
-{
-
-    IPlaybackCore playbackCore = null;
-    
+    /*
-    //Move to SubWindow or similar:
-    float width = 1.0f;//512;//1024/2
@@ -80 +81 @@
-        //resize();
-    }
-
+
-
-    //My stuff:
@@ -99 +100 @@
-    }
-    
+    void seekToStart()
+    {
+        m_seekPosition = 0;
+        fs = qtvideo[2].getFrame( m_seekPosition );
+    }
+    
+    void seekToEnd()
+    {
+        m_seekPosition = qtvideo[2].length - qtvideo[2].ticksPerFrame();
+        Trace.formatln("video end is at: {}", qtvideo[2].length );
+        Trace.formatln("m_seekPosition: {}", m_seekPosition );
+        fs = qtvideo[2].getFrame( m_seekPosition );
+    }
+    
+    void seekFrameForward()
+    {
+        m_seekPosition += qtvideo[2].ticksPerFrame();
+        fs = qtvideo[2].getFrame( m_seekPosition );
+        Trace.formatln("m_seekPosition: {}", m_seekPosition );
+    }
+    
+    void seekFrameBackward()
+    {
+        m_seekPosition -= qtvideo[2].ticksPerFrame();
+        fs = qtvideo[2].getFrame( m_seekPosition );
+        Trace.formatln("m_seekPosition: {}", m_seekPosition );
+    }
+    
-    void play()
-    {
@@ -113 +142 @@
-    uint currentVideo = 0;
-    int64_t m_seekPosition = 0;
+    
-    float x_aspect = 1.78f;
-    float y_aspect = 1.0f;
-
+    /*
-    //To be removed or changed stuff:
-    GLfloat xpos = 0.0f;
-    GLfloat ypos = 0.0f;
-* X Rotation */
-* Y Rotation */
-* X Rotation Speed */
-* Y Rotation Speed */
-* Depth Into The Screen */
-
+/ X Rotation 
+/ Y Rotation 
+/ X Rotation Speed 
+/ Y Rotation Speed 
+/ Depth Into The Screen 
+
-    
-
@@ -135 +166 @@
-        scope(exit) Trace.formatln("VideoViewer.this() END.");
-        
+        super();
+        
-        initVideo();
-        initAudio();
+        
+        initVideoGL();
+        
+        //colour(1.0f, 0.3f, 0.1f, 1.0f);
-    }
-    
@@ -179 +216 @@
-    const TEXTURE_HEIGHT = 1024.0;
-    
+    //Smaller sizes don't seem to work at all.
+    //Propably because of the openGL call that
+    //is being used for resizing the texture.
-    /*
-    const T_W_F = 512.0;
@@ -306 +346 @@
-    
-    
+    /*
-    void resize()
-/*
+
-        if( height == 0.0f )
-            height = 1.0f;
@@ -326 +367 @@
-        //gluPerspective( 45.0f, 1.0f, 0.1f, 100.0f );
-        glMatrixMode( GL_MODELVIEW );
-
-
+
+
+
-    
-    //rename to render() draw() or similar.
-bool drawGL
+void render
-    {
-        glPushMatrix();
+    
+            applyPosition();
+            applyRotation();
+            applyScale();
+            applyColour();
+            applyClipping();
-    
-        /*GLdouble eqn[4] = [0.0, 1.0, 0.0, 0.0];    // y < 0
@@ -356 +404 @@
-
-    /* Translate Into/Out Of The Screen By z */
+    
+    /*
+    
-    glTranslatef( 0.0f, 0.0f, z );
-
-        glTranslatef( xpos, ypos, 0.0f );
-
-
-
+
+
+
+
-
-        drawVideo();
-
+        /*
-        //Move these to idle:
-* Add xspeed To xrot */
-* Add yspeed To yrot */
+/ Add xspeed To xrot
+/ Add yspeed To yrot 
-        
-        if( xspeed > 0.1f )
@@ -379 +433 @@
-            yspeed += 0.1f;
-        else yspeed = 0.0f;
+        */
+        
-        
-        glPopMatrix();
-        
-        return true;
-    }
-    
-    void pushFrame( frame_struct* frame, bool move_cursor = true )
-    {
-        //Trace.formatln("pushFrame...Umm.");
-        fs = frame;
-        drawVideo();
-    }
-    
-    void pushFrameStack( frame_struct** set_fs, bool move_cursor = true )
-    {
-        Trace.formatln("pushFrameStack...Umm.");
-        if( set_fs !is null )
-            pushFrame(set_fs[0]);
-        //drawVideo();
-    }
-    
-    void exporter( IVideoFileWriter fwriter )
-    {
-        uint vid_num = 0;
-        
-        if( vid_num >= nro_videos )
-            return;
-                
-        for( uint i = 0; i < nro_videos; i++ )
-        {
-            Trace.formatln("Processing clip nro: {}", i);
-            
-            Trace.formatln("ticksPerFrame: {}", qtvideo[i].ticksPerFrame() );
-            Trace.formatln("NLE_TIME_BASE: {}", NLE_TIME_BASE);
-            
-            int64_t tempvidpos = 25 * qtvideo[i].ticksPerFrame();
-            int64_t tempaudiopos = tempvidpos / (NLE_TIME_BASE / 48000 );
-            
-            //Trace.formatln("tempvidpos: ")(tempvidpos);
-            //Trace.formatln("tempaudiopos: ")(tempaudiopos);
-            
-            int64_t framesPerBuffer = qtvideo[i].ticksPerFrame() / (NLE_TIME_BASE / 48000 );
-            
-            Trace.formatln("framesPerBuffer: {}", framesPerBuffer);
-            
-            scope float[] outputBuffer = new float[framesPerBuffer*2];
-            
-            
-            
-            for( m_seekPosition = 0; m_seekPosition < qtvideo[i].length(); m_seekPosition += qtvideo[i].ticksPerFrame() )
-            {
-                //m_seekPosition += qtvideo[currentVideo].ticksPerFrame();//400000l;//frame_duration;
-                fs = qtvideo[i].getFrame( m_seekPosition );
-            
-                fwriter.encodeVideoFrame( fs );
-                
-                int64_t m_audioPosition = m_seekPosition / (NLE_TIME_BASE / 48000);
-                
-                //Trace.formatln( "videopos: ")(m_seekPosition);
-                //Trace.formatln("audiopos: ")(m_audioPosition);
-                
-                if( audioFile !is null )
-                {
-                    /*Trace.formatln( "seekpos: ")(m_seekPosition);
-                    Trace.formatln( "lenght: ")( qtvideo[i].length() );
-                
-                    Trace.formatln("Trying sampleseek: ")(m_audioPosition);*/
-                
-                    audioFile.sampleseek( 0, m_audioPosition );
-                }
-                
-                
-                /*foreach( float a; outputBuffer )
-                {
-                    a = 0.0f;
-                }*/
-                
-                uint next_move;
-                if( audioFile !is null )
-                {
-                    //Trace.formatln("Trying fillBuffer: ");
-                    next_move = audioFile.fillBuffer( outputBuffer.ptr, framesPerBuffer );
-                }
-                
-                foreach( float a; outputBuffer )
-                {
-                    //a = 0.0f;
-                    if( a > 0.1f || a < -0.1f )
-                    //if( a != 0.0f )
-                        Trace.formatln("a: {}", cast(double)a);
-                }
-                
-                fwriter.encodeAudioFrame( outputBuffer.ptr, framesPerBuffer );
-            }
-            
-        }
-    }
-    
@@ -548 +510 @@
-                */
-                
-
-
+
+
+
+
-                gl_x = -gl_w * 0.5f;//-2.0f;
-                gl_y = -gl_h * 0.5f;//-1.5f;
@@ -573 +537 @@
-    }
-    
+    void pushFrame( frame_struct* frame, bool move_cursor = true )
+    {
+        //Trace.formatln("pushFrame...Umm.");
+        fs = frame;
+        drawVideo();
+    }
+    
+    void pushFrameStack( frame_struct** set_fs, bool move_cursor = true )
+    {
+        Trace.formatln("pushFrameStack...Umm.");
+        if( set_fs !is null )
+            pushFrame(set_fs[0]);
+        //drawVideo();
+    }
+    
+    void exporter( IVideoFileWriter fwriter )
+    {
+        uint vid_num = 0;
+        
+        if( vid_num >= nro_videos )
+            return;
+                
+        for( uint i = 0; i < nro_videos; i++ )
+        {
+            Trace.formatln("Processing clip nro: {}", i);
+            
+            Trace.formatln("ticksPerFrame: {}", qtvideo[i].ticksPerFrame() );
+            Trace.formatln("NLE_TIME_BASE: {}", NLE_TIME_BASE);
+            
+            int64_t tempvidpos = 25 * qtvideo[i].ticksPerFrame();
+            int64_t tempaudiopos = tempvidpos / (NLE_TIME_BASE / 48000 );
+            
+            //Trace.formatln("tempvidpos: ")(tempvidpos);
+            //Trace.formatln("tempaudiopos: ")(tempaudiopos);
+            
+            int64_t framesPerBuffer = qtvideo[i].ticksPerFrame() / (NLE_TIME_BASE / 48000 );
+            
+            Trace.formatln("framesPerBuffer: {}", framesPerBuffer);
+            
+            scope float[] outputBuffer = new float[framesPerBuffer*2];
+            
+            
+            
+            for( m_seekPosition = 0; m_seekPosition < qtvideo[i].length(); m_seekPosition += qtvideo[i].ticksPerFrame() )
+            {
+                //m_seekPosition += qtvideo[currentVideo].ticksPerFrame();//400000l;//frame_duration;
+                fs = qtvideo[i].getFrame( m_seekPosition );
+            
+                fwriter.encodeVideoFrame( fs );
+                
+                int64_t m_audioPosition = m_seekPosition / (NLE_TIME_BASE / 48000);
+                
+                //Trace.formatln( "videopos: ")(m_seekPosition);
+                //Trace.formatln("audiopos: ")(m_audioPosition);
+                
+                if( audioFile !is null )
+                {
+                    /*Trace.formatln( "seekpos: ")(m_seekPosition);
+                    Trace.formatln( "lenght: ")( qtvideo[i].length() );
+                
+                    Trace.formatln("Trying sampleseek: ")(m_audioPosition);*/
+                
+                    audioFile.sampleseek( 0, m_audioPosition );
+                }
+                
+                
+                /*foreach( float a; outputBuffer )
+                {
+                    a = 0.0f;
+                }*/
+                
+                uint next_move;
+                if( audioFile !is null )
+                {
+                    //Trace.formatln("Trying fillBuffer: ");
+                    next_move = audioFile.fillBuffer( outputBuffer.ptr, framesPerBuffer );
+                }
+                
+                foreach( float a; outputBuffer )
+                {
+                    //a = 0.0f;
+                    if( a > 0.1f || a < -0.1f )
+                    //if( a != 0.0f )
+                        Trace.formatln("a: {}", cast(double)a);
+                }
+                
+                fwriter.encodeAudioFrame( outputBuffer.ptr, framesPerBuffer );
+            }
+            
+        }
+    }
+    
+    
+    
-    
-
@@ -599 +657 @@
-                case GDK_Up:
-                //case GDK_r:
-
-
+
-                break;
-                case GDK_Left:
-
-
+
-                    //currentVideo--;
-                break;
-                case GDK_Right:
-
-
+
-                    //currentVideo++;
-                break;
@@ -628 +683 @@
-                break;
-                case GDK_z:
-r
-r
-
-
+R
+R
+//
+//
-                break;
-                case GDK_u:
-
+//
-                break;
-                case GDK_o:
-
+//
-                break;
-                
-                case GDK_w:
-
+//
-                break;
-                case GDK_s:
-
+//
-                break;
-                case GDK_a:
-
+//
-                break;
-                case GDK_d:
-
+//
-                break;
-                
@@ -665 +720 @@
-                
-                case GDK_i:
-
+//
-                    //Trace.formatln("i pressed.")("xspeed: ")(xspeed);
-                break;
-                case GDK_k:
-
+//
-                    //Trace.formatln("k pressed.")("xspeed: ")(xspeed);
-                break;
-                case GDK_l:
-
+//
-                    //Trace.formatln("l pressed.")("yspeed: ")(yspeed);
-                break;
-                case GDK_j:
-
+//
-                    //Trace.formatln("j pressed.")("yspeed: ")(yspeed);
-                break;
@@ -734 +789 @@
-        */
-        videoViewer = new VideoViewer();
-
-
+//
+//
-        //add( videoViewer );
-        
@@ -741 +796 @@
-        
-        
-0.5windowrect
+Viewer
-        //myWindow2.isRotate = true;
-        Trace.formatln("{}", myWindow2 );
-5, 0.5
+8, 0.4
-        Trace.formatln("{}", myWindow2 );
-        //myWindow2.colour( 0.2, 0.5, 0.3, 0.5 );
-        myWindow2.signalMouseButtonPress.attach(&clickHandler);
-        
+        myWindow2.add(videoViewer);
+        
-        add(myWindow2);
-        
@@ -754 +811 @@
-
-        
-upleftwindow
+Pihlaja
-        //myWindow2.isRotate = true;
-        Trace.formatln("{}", myWindow3 );
@@ -818 +875 @@
-        myWindow3.add(insideButton);*/
-        
-rightsmallwindow
+Timeline
-        myWindow4.moveTo( 0.3f, 0.0f );
-        myWindow4.defaultSize( 0.2f, 0.1f );
@@ -844 +901 @@
-        
-        playButton = new Button("Play");
-
+//
-        playButton.defaultSize( 0.1f, 0.05f );
-        //playButton.colour( 0.3f, 0.3f, 0.3f, 0.7f );
-        playButton.signalActivate.attach(&playHandler);
-        //playButton.signalMouseButtonPress.attach(&playHandler);
-
+myWindow4.
-        
-        exportButton = new Button("Export");
@@ -856 +913 @@
-        exportButton.colour( 0.5f, 0.3f, 0.3f, 0.7f );
-        exportButton.signalActivate.attach(&exportButtonHandler);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-    }
@@ -1107 +1179 @@
-            //playButton.colour( 1.0f, 1.0f, 1.0f, 1.0f );
-            //clickcol = false;
+            playButton.ungrabInput();
-        }
-        else
@@ -1112 +1185 @@
-            //playButton.colour( 0.2f, 0.4f, 0.2f, 1.0f );
-            //clickcol = true;
+            playButton.grabInput();
-        }
-        
@@ -1136 +1210 @@
-    Button exportButton;
-    Button playButton;
+    Button seekToStartButton;
+    Button seekToEndButton;
+    Button seekFrameForwardButton;
+    Button seekFrameBackwardButton;
-    SubWindow myWindow3;
-    SubWindow myWindow4;
@@ -1171 +1249 @@
-        }
-    }
-
+/*
-    void render()
-    {
@@ -1184 +1262 @@
-        
-    }
+    */
-    
-    

trunk/pihlaja/src/shiraz/av/AudioFileQT.d

@@ -84 +84 @@
-        }
-        m_ok = true;
+        
+        left_buffer = l_buffer.ptr;
+        right_buffer = r_buffer.ptr;
+        
+        //buf_pointer = [ left_buffer, right_buffer ];
+        buf_pointer[0] = left_buffer;
+        buf_pointer[1] = right_buffer;
-    }
-
@@ -97 +104 @@
-    int64_t length() { return m_length; }
-    
-
+synchronized 
-    {
-        //Trace.formatln("position:")(position);
@@ -105 +112 @@
-    }
-    
-
+synchronized 
-    {
-        seek( position );
-    }
-    
-
+synchronized 
-        // sizof(output) == frames * 2
-        // File Format: 48000 stereo interleaved
-    {
-//
-//
+debug(audio) 
+debug(audio) 
-    
-        // l_buffer and r_buffer are defined in the class definition
-
-
+//
+//
-        
-
-
+
+
+
+
+
-        int64_t diff = lqt_last_audio_position( m_qt, 0 );
-
+/*
-        {
+            Trace.formatln("Audio buffer is bigger than 4096. Not supported yet.");
+            throw new Exception("Audio buffer is bigger than 4096. Not supported yet.");
-            templeft = new float[frames];
-            tempright = new float[frames];
-            left_buffer = templeft.ptr;
-            right_buffer = tempright.ptr;
-
-
+
+
+
+
-        //lqt_decode_audio_track( m_qt, null, cast(float**)buf_pointer.ptr, frames, 0 );
-        lqt_decode_audio_track( m_qt, null, buf_pointer.ptr, frames, 0 );
+        
-        diff = lqt_last_audio_position( m_qt, 0 ) - diff;
+        
-        if ( m_oneShot )
-        {
@@ -145 +161 @@
-            output[i * 2 + 1] = right_buffer[i];
-        }
-
+/*
-        {
-            delete left_buffer;
-            delete right_buffer;
-
+*/
-        return diff;
-    }
@@ -166 +182 @@
-    float[4096] l_buffer;
-    float[4096] r_buffer;
+    
+    float* left_buffer;// = l_buffer.ptr;
+    float* right_buffer;// = r_buffer.ptr;
+    
+    float*[2] buf_pointer;// = [ left_buffer, right_buffer ];
-}
-

trunk/pihlaja/src/shiraz/av/PortAudioPlaybackCore.d

@@ -93 +93 @@
-//End TEMP sine stuff.
-
+static bool thread_attach_once = true;
+
-extern (C)
-//static int portaudio_callback( void *input, void *output, unsigned long frames, PaTimestamp time, void* data )
@@ -105 +107 @@
-    //scope(exit) Trace.formatln("portaudio_callback() END.");
-
-
-
-
+
+
+
+
+
+
-    {
-        Trace.formatln("portaudio_callback() attaching thread.");
-        thread_attachThis();
-
+thread_attach_
-    }
-
@@ -178 +183 @@
-static PaStream* g_stream;
-
+//synchronized 
-static bool portaudio_start( int rate, int frames, void* set_data )
-{
@@ -226 +232 @@
-    return false;
-}
+//synchronized 
-static bool portaudio_stop()
-{
@@ -297 +304 @@
-    }
-    
+    //synchronized 
-    void play()
-    {
@@ -313 +321 @@
-        }
-        
+        thread_attach_once = true;
-    
-        //C: m_currentFrame = g_timeline.m_seekPosition;
@@ -343 +352 @@
-    void pause() { ; }
-
+    //synchronized 
-    void stop()
-    {
@@ -369 +379 @@
-    }
-    
-
-
+
-    {
-        //Trace.formatln("PortAudioPlaybackCore.readAudio() START.");
@@ -436 +445 @@
-    }
-
-
-
+
-    {
-        //Trace.formatln("flipFrame");

trunk/pihlaja/src/shiraz/canvas/Bezier.d

@@ -76 +76 @@
-    public Point next()
-    {
-//
-//
+
+
-    
-        Point ret = p( anim_i, anim_step/cast(float)STEPS );
@@ -94 +94 @@
-            //now we set isLoop to true to show others
-            //that we're looping. Any better ideas for this API?
-//
-
+
+//
-            anim_i = 0;
-            anim_step = 0;

trunk/pihlaja/src/shiraz/canvas/Draw.d

@@ -50 +50 @@
-}
-
+const real PI2 = PI * 2.0f;
+
+void circle(float x, float y, float w, float h)
+{
+    //glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+
+    w = w * 0.5f;
+    h = h * 0.5f;
+
+    glBegin(GL_TRIANGLE_FAN);
+    //glBegin(GL_POINTS);
+    
+        glVertex3f( x, y, 0.0f );
+        
+        float step = PI2 / 24.0f;
+        
+        for( float a = 0.0f; a <= PI2 + step; a += step )
+        {
+            glVertex3f( x + cos(a) * w, y + sin(a) * h, 0.0f );
+        }
+    
+    glEnd();
+}
+
+void drawCircle( GLubyte[] image, uint wid, uint hei, uint chan, float[4] set_colour )
+{
+    cairo_format_t form = cairo_format_t.ARGB32;
+     
+    if( chan == 4 )
+        form = cairo_format_t.ARGB32;
+    else if( chan == 3 )
+        form = cairo_format_t.RGB24;
+    //TODO other cairo_format_t.
+
+    Surface imageSurface = ImageSurface.createForData(image.ptr, form, wid, hei, wid * chan);
+    //ImageSurface.createForData(ubyte* data, cairo_format_t format, int width, int height, int stride);
+    scope(exit) delete imageSurface;//doesn't call destroy...BUG in gtkD.
+
+    auto cr = Context.create(imageSurface);
+    scope(exit) delete cr;
+
+    cr.save();
+        //cr.rotate(PI*0.1);
+        //cr.scale(1.0, -1.0);
+        //cr.translate(0, -2);
+        cr.translate(wid/2, hei/2);
+        
+        /*
+        //A temporary rectangle
+            cr.rectangle( 0.0, 0.0, wid, hei );
+            cr.setSourceRgba(1.0, 0.1, 0.3, 0.8);
+            cr.fill();
+        //
+        */
+        
+        
+        //cr.translate(0, 14);
+        cr.setLineWidth(1.0);
+        //cr.moveTo(0.0, 0.0);
+            //cr.selectFontFace("Bitstream Vera Sans", cairo_font_slant_t.NORMAL,
+                        //cairo_font_weight_t.NORMAL);
+                        
+        cr.setSourceRgba(set_colour[0], set_colour[1], set_colour[2], set_colour[3]);
+        
+        cr.arc(0, 0, 6.0, 0, 2 * PI);
+        cr.fill();
+    cr.restore();
+    
+    /*
+    cr.save();
+        cr.rectangle( 0.0, 0.0, 20.0, 20.0 );
+            cr.setSourceRgba(0.3, 0.6, 0.3, 0.8);
+            cr.fill();
+    cr.restore();
+    */
+    
+    cr.destroy();
+    imageSurface.destroy();
+    
+}
+
-void showText( char[] set_text, GLubyte[] image, uint wid, uint hei, uint chan, float[4] set_colour )
-{

trunk/pihlaja/src/shiraz/canvas/Image.d

@@ -114 +114 @@
-    protected uint minFilter(){ return m_minFilter; }
-    
+    //TODO maybe we put these to be in the
+    //Rectangle????
+    public uint blendSource = GL_SRC_ALPHA;
+    public uint blendDestination = GL_ONE_MINUS_SRC_ALPHA;
+    //public uint blendDestination = GL_ONE;//transparent blacks.
+    
-    void pushTexture()
-    {
@@ -120 +126 @@
-        glEnable( glTextureType );
-        glBindTexture( glTextureType, m_id );
+        
+        glBlendFunc( blendSource, blendDestination );
-    }
-    
@@ -384 +392 @@
-    }
-    
+    static Image createCircle( float[4] set_colour )
+    {
+        Image img = new Image();
+        img.drawCircle(set_colour);
+        return img;
+    }
+    
+    void drawCircle( float[4] set_colour )
+    {
+        uint m_width = 24;
+        uint m_height = 24;
+        uint m_channels = 4;
+        scope GLubyte[] image = new GLubyte[(m_width*m_height)*m_channels];
+        Draw.drawCircle( image, m_width, m_height, m_channels, set_colour );
+        createTextureFromData( image, m_width, m_height, m_channels );
+    }
+    /*
+    static Image createTopHeader()
+    {
+        Image img = new Image();
+            
+        uint m_width = ;
+        uint m_height = 24;
+        uint m_channels = 4;
+        scope GLubyte[] image = new GLubyte[(m_width*m_height)*m_channels];
+        Draw.drawTopHeader( image, m_width, m_height, m_channels );
+        img.createTextureFromData( image, m_width, m_height, m_channels );
+        
+        return img;
+    }
+    */
+    
-    uint findSmallestNumber(GLubyte[] image)
-    {