Changeset 1958

Timestamp:

2006-02-05 21:23:45 (3 years ago)

Author:

ctford

Message:

Give duration info, and put download Annodex, Ogg Theora and CMML links down the bottom out of the way.

Files:

• Anode/trunk/acidfree/class_annodex.inc (modified) (3 diffs)

Anode/trunk/acidfree/class_annodex.inc

@@ -169 +169 @@
-        }
-
-
-        $arg_name = "media";
-
+
+
+
+
-        if(isset($_GET[$arg_name])) {
-                $mode = $_GET[$arg_name];
@@ -199 +201 @@
-        } else {
-
-
-
-
-
-
-
-
-
+
+
+
-                $output .= clip_table( $node, $arg_name );
-
-                /* Add new clip form */
-                if( $editing ) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<div>
-<br /><br />
@@ -224 +385 @@
-</div>
-</form>';
-                }
-                
-                $output .= $node->body;
-        }
-
-        return $output;
-}
-
-/* FIXME Need major error checking. */
-function insert_clip( $attributes, $node ) {
-        if( $attributes['id'] ) {
-                $start = 60*60*$attributes['start_hours'] + 60*$attributes['start_minutes'] + $attributes['start_seconds'];
-
-                /* Check whether we need to create a new clip or just update an
-                 * old one.
-                 */
-                $occurances = db_result(db_query("SELECT COUNT(`id`) FROM {acidfree_cmml_clips} WHERE `id` = '{$attributes['id']}';"));
-
-                if( $occurances == 0 ) {
-
-                        $img = add_clip_png( $node, $attributes['id'], $start );
-                        
-                        $result = db_query("INSERT INTO {acidfree_cmml_clips} (`nid`, `a_href`, `a_text`, `img`, `desc`, `start`, `end`, `id`, `track`) VALUES('{$node->nid}', '{$attributes['a_href']}', '{$attributes['a_text']}', '$img', '{$attributes['desc']}', $start, ".(float)$attributes['end'].",'{$attributes['id']}', '{$attributes['track']}');");                
-                } else {
-                        $result = db_query("UPDATE {acidfree_cmml_clips} SET `nid` = '{$node->nid}', `a_href` = '{$attributes['a_href']}', `a_text` = '{$attributes['a_text']}', `img` = '{$attributes['img']}', `desc` = '{$attributes['desc']}', `start` = '$start', `end` = '{$attributes['end']}', `id` = '{$attributes['id']}', `track` = '{$attributes['track']}' WHERE `id` = '{$attributes['id']}';");
-                }
-        }
-
-        return;
-}
-
-function clip_table( $node, $arg_name) {
-
-                $result = db_query("SELECT * FROM {acidfree_cmml_clips} WHERE nid={$node->nid} ORDER BY `start`;");     
-
-                /* Output clip information in a themed table. */
-                $table_rows = array();
-                $header = array();
-                $header[] = array( 'data'=>'Clip ID');
-                $header[] = array( 'data'=>'Image');
-                $header[] = array( 'data'=>'Description');
-                $header[] = array( 'data'=>'Options');
-
-                while( $row = db_fetch_object($result) ) {
-
-                        $cells = array();
-
-                        $cells[] = array('data'=>l($row->id, "node/{$node->nid}",NULL,"$arg_name=annodex&id={$row->id}")."<br />");
-                        if( $row->img ) {
-                                $cells[] = array('data'=>"<a href =\"?q=node/{$node->nid}&$arg_name=annodex&id={$row->id}\"><img height=120 width=120 src=\"{$row->img}\"></a>");
-                        } else {
-                                $cells[] = array('data'=>NULL);
-                        }
-
-                        if( $row->desc ) {
-                                $cells[] = array('data'=>wordwrap($row->desc,40, '<br \>', TRUE));
-                        } else {
-                                $cells[] = array('data'=>NULL);
-                        }
-
-                        $cells[] = array('data'=>"dummy edit");
-
-                        /* Add cells */
-                        $table_rows[] = $cells;
-                }
-                /* Add table */
-                return theme_table( $header, $table_rows );
-
-}
-
-function add_clip_png( $node, $id, $time) {
-
-        $mplayer = variable_get('acidfree_path_to_mplayer', '/usr/bin/mplayer');
-        $tmpdir = acidfree_mktmpdir('mplayer');
-        $path = realpath(_acidfree_get_large_path( $node, true ));
-        $command = "$mplayer -vo png:z=6 -vf scale -zoom -xy 120 -ao null -ss $time -frames 1 $path";
-            chdir($tmpdir);
-            $mplayeroutput = shell_exec($command);
-            if ($oldcwd) {
-                chdir($oldcwd);
-            }
-            $mplayer_out = $tmpdir.DIRECTORY_SEPARATOR."00000002.png";
-            if (!file_exists($mplayer_out)) {
-                drupal_set_message("file $mplayer_out does not exist", 'error');
-            } else if(!is_readable($mplayer_out)) {
-                drupal_set_message("file $mplayer_out is not readable", 'error');
-            } else {
-                    $filename = "{$node->nid}_$id.png";
-                    $png = acidfree_add_file($node, $mplayer_out, $filename, "image/png", true);
-            }
-
-        //FIXME This will only work if an absolute path is given for
-        //filemanager. This is a hack to get around the mess that giving
-        //absolute path to filemanager wreaks with the URLs.
-        if( $png->working ) {
-                $area = "working";
-        } else if ( $png->active ) {
-                $area = "active";
-        }
-        if( $path->dir ) {
-                $dir = "1";
-        } else {
-                $dir = "0";
-        }
-        $path = "files/$area/$dir/{$png->filename}";
-        $bad_url = url($path,null,null,true);
-        $base_url = explode( "/?q", $bad_url );
-        $path = "{$base_url[0]}/$path";
-        return $path;
-}