Changeset 5eb23c8e0a5ba9756ecbd83c8136fafbc0d3beb9

Timestamp:

14/12/04 20:29:50 (4 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1103052590 +0000

git-parent:

[d2adc9f3c197dfb3b148db04d24f838d7f0befcd]

git-author:

Clément Stenac <zorglub@videolan.org> 1103052590 +0000

Message:

Restore loop
Fix command line parsing

Files:

• src/misc/configuration.c (modified) (5 diffs)
• src/playlist/playlist.c (modified) (4 diffs)

src/misc/configuration.c

@@ -213 +213 @@
-    }
-
+
-    /* return a copy of the string */
-    vlc_mutex_lock( p_config->p_lock );
@@ -236 +237 @@
-    p_config = config_FindConfig( p_this, psz_name );
-
+
-    /* sanity checks */
-    if( !p_config )
@@ -246 +248 @@
-        (p_config->i_type!=CONFIG_ITEM_DIRECTORY) &&
-        (p_config->i_type!=CONFIG_ITEM_MODULE_LIST) &&
+        (p_config->i_type!=CONFIG_ITEM_MODULE_CAT) &&
-        (p_config->i_type!=CONFIG_ITEM_MODULE_LIST_CAT) &&
-        (p_config->i_type!=CONFIG_ITEM_MODULE) )
@@ -1445 +1448 @@
-            case CONFIG_ITEM_DIRECTORY:
-            case CONFIG_ITEM_MODULE:
+            case CONFIG_ITEM_MODULE_LIST:
+            case CONFIG_ITEM_MODULE_LIST_CAT:
+            case CONFIG_ITEM_MODULE_CAT:
-                config_PutPsz( p_this, psz_name, optarg );
-                break;
@@ -1473 +1479 @@
-            case CONFIG_ITEM_DIRECTORY:
-            case CONFIG_ITEM_MODULE:
+            case CONFIG_ITEM_MODULE_CAT:
+            case CONFIG_ITEM_MODULE_LIST:
+            case CONFIG_ITEM_MODULE_LIST_CAT:
-                config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg );
-                break;

src/playlist/playlist.c

@@ -871 +871 @@
-                                    p_playlist->request.p_node,
-                                    p_new );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
@@ -910 +925 @@
-            {
-                msg_Dbg( p_playlist,"finished" );
-
+
+
+
+
+
+
+
-            }
-        }
@@ -924 +945 @@
-                            p_playlist->status.p_node,
-                            p_playlist->status.p_item );
+            if( p_new == NULL && b_loop )
+            {
+                p_new = playlist_FindNextFromParent( p_playlist,
+                                   p_playlist->status.i_view,
+                                   p_view->p_root,
+                                   p_playlist->status.p_node,
+                                   NULL );
+            }
-        }
-    }
@@ -939 +968 @@
-#endif
-
-
-
+
+
+
+
-    return p_new;
-}